diff mbox series

[Unstable/Noble,1/2] UBUNTU: [Packaging] Move indep tools package stubs to debian/control.d

Message ID 20240207111515.1984805-2-juerg.haefliger@canonical.com
State New
Headers show
Series Don't produce linux-*-cloud-tools-common, linux-*-tools-common and linux-*-tools-host binary packages (LP: #2048183) | expand

Commit Message

Juerg Haefliger Feb. 7, 2024, 11:15 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2048183

The following packages may only be built for the main linux source
package. Similar to linux-libc-dev, move the packaging stubs to
debian/control.d and only include them if the source package name is
indeed 'linux':
  - linux-tools-common
  - linux-cloud-tools-common
  - linux-host-tools

Also change the package names in the rules to linux-* to further make
sure that we don't accidentially build linux-<variant>-* packages should
a derivative's control file contain incorrect package stanzas.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian.master/control.stub.in                 | 35 -------------------
 .../control.d/linux-cloud-tools-common.stub   | 10 ++++++
 debian/control.d/linux-tools-common.stub      | 12 +++++++
 debian/control.d/linux-tools-host.stub        |  9 +++++
 debian/rules                                  |  3 ++
 debian/rules.d/0-common-vars.mk               |  6 ++--
 6 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100644 debian/control.d/linux-cloud-tools-common.stub
 create mode 100644 debian/control.d/linux-tools-common.stub
 create mode 100644 debian/control.d/linux-tools-host.stub
diff mbox series

Patch

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index daeeb406e542..5bc5986172e1 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -93,19 +93,6 @@  Description: Header files related to Linux kernel version PKGVER
  that want the latest kernel headers. Please read
  /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
 
-Package: SRCPKGNAME-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Provides: bpftool
-Depends: ${misc:Depends}, lsb-release, hwdata
-Description: Linux kernel version specific tools for version PKGVER
- This package provides the architecture independent parts for kernel
- version locked tools (such as perf and x86_energy_perf_policy) for
- version PKGVER.
-
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: amd64 armhf arm64 ppc64el s390x
@@ -119,17 +106,6 @@  Description: Linux kernel version specific tools for version PKGVER-ABINUM
  =HUMAN=.
  You probably want to install linux-tools-PKGVER-ABINUM-<flavour>.
 
-Package: SRCPKGNAME-cloud-tools-common
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}
-Description: Linux kernel version specific cloud tools for version PKGVER
- This package provides the architecture independent parts for kernel
- version locked tools for cloud tools for version PKGVER.
-
 Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
 Architecture: amd64 armhf
@@ -141,14 +117,3 @@  Description: Linux kernel version specific cloud tools for version PKGVER-ABINUM
  version locked tools for cloud tools for version PKGVER-ABINUM on
  =HUMAN=.
  You probably want to install linux-cloud-tools-PKGVER-ABINUM-<flavour>.
-
-Package: SRCPKGNAME-tools-host
-Build-Profiles: <!stage1>
-Architecture: all
-Multi-Arch: foreign
-Section: kernel
-Priority: optional
-Depends: ${misc:Depends}, python3
-Description: Linux kernel VM host tools
- This package provides kernel tools useful for VM hosts.
-
diff --git a/debian/control.d/linux-cloud-tools-common.stub b/debian/control.d/linux-cloud-tools-common.stub
new file mode 100644
index 000000000000..724dab9bef00
--- /dev/null
+++ b/debian/control.d/linux-cloud-tools-common.stub
@@ -0,0 +1,10 @@ 
+Package: linux-cloud-tools-common
+Build-Profiles: <!stage1>
+Architecture: all
+Multi-Arch: foreign
+Section: kernel
+Priority: optional
+Depends: ${misc:Depends}
+Description: Linux kernel version specific cloud tools for version PKGVER
+ This package provides the architecture independent parts for kernel
+ version locked tools for cloud tools for version PKGVER.
diff --git a/debian/control.d/linux-tools-common.stub b/debian/control.d/linux-tools-common.stub
new file mode 100644
index 000000000000..575897a6bf59
--- /dev/null
+++ b/debian/control.d/linux-tools-common.stub
@@ -0,0 +1,12 @@ 
+Package: linux-tools-common
+Build-Profiles: <!stage1>
+Architecture: all
+Multi-Arch: foreign
+Section: kernel
+Priority: optional
+Provides: bpftool
+Depends: ${misc:Depends}, lsb-release, hwdata
+Description: Linux kernel version specific tools for version PKGVER
+ This package provides the architecture independent parts for kernel
+ version locked tools (such as perf and x86_energy_perf_policy) for
+ version PKGVER.
diff --git a/debian/control.d/linux-tools-host.stub b/debian/control.d/linux-tools-host.stub
new file mode 100644
index 000000000000..f2ea6a9f7fff
--- /dev/null
+++ b/debian/control.d/linux-tools-host.stub
@@ -0,0 +1,9 @@ 
+Package: linux-tools-host
+Build-Profiles: <!stage1>
+Architecture: all
+Multi-Arch: foreign
+Section: kernel
+Priority: optional
+Depends: ${misc:Depends}, python3
+Description: Linux kernel VM host tools
+ This package provides kernel tools useful for VM hosts.
diff --git a/debian/rules b/debian/rules
index 1319a5f5d86a..eb2d9a82ffd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -166,6 +166,9 @@  include $(DROOT)/rules.d/4-checks.mk
 control_files := $(DEBIAN)/control.stub.in
 ifeq ($(src_pkg_name),linux)
 	control_files += debian/control.d/linux-libc-dev.stub
+	control_files += debian/control.d/linux-tools-common.stub
+	control_files += debian/control.d/linux-cloud-tools-common.stub
+	control_files += debian/control.d/linux-tools-host.stub
 endif
 
 # Calculate Ubuntu Compatible Signing levels
diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 0f6108d7ca05..1c94e2e75ebd 100644
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -139,12 +139,12 @@  else
 	do_tools?=false
 endif
 tools_pkg_name=$(src_pkg_name)-tools-$(abi_release)
-tools_common_pkg_name=$(src_pkg_name)-tools-common
+tools_common_pkg_name=linux-tools-common
 tools_flavour_pkg_name=linux-tools-$(abi_release)
 cloud_pkg_name=$(src_pkg_name)-cloud-tools-$(abi_release)
-cloud_common_pkg_name=$(src_pkg_name)-cloud-tools-common
+cloud_common_pkg_name=linux-cloud-tools-common
 cloud_flavour_pkg_name=linux-cloud-tools-$(abi_release)
-hosttools_pkg_name=$(src_pkg_name)-tools-host
+hosttools_pkg_name=linux-tools-host
 
 # The general flavour specific image package.
 do_flavour_image_package=true