tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: [Packaging] Move indep tools package stubs to debian/control.d

Browse Source 
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>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Juerg Haefliger
2024-02-07 12:15:14 +01:00
committed by Paolo Pisati
parent 8bcd213df1
commit a2e24f00c1
6 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian.master/control.stub.in
-35
View File
@@ -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.
debian/control.d/linux-cloud-tools-common.stub
Vendored
+10
View File
@@ -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.
debian/control.d/linux-tools-common.stub
Vendored
+12
View File
@@ -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.
debian/control.d/linux-tools-host.stub
Vendored
+9
View File
@@ -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.
debian/rules
Vendored
+3
View File
@@ -160,6 +160,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
debian/rules.d/0-common-vars.mk
Vendored
+3 -3
View File
@@ -138,12 +138,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