From fdc64a012fc6124266b0eb629d697b6aea82f89f Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 29 Oct 2024 05:12:06 +0300 Subject: [PATCH] rename/adjust kernel packages --- debian/bin/gencontrol.py | 10 +--------- debian/templates/config.control.in | 8 +++----- debian/templates/headers.control.in | 10 +++++----- debian/templates/headers.featureset.control.in | 4 ++-- debian/templates/headers.meta.control.in | 8 ++++---- debian/templates/headers.meta.maintscript.in | 1 - debian/templates/image.control.in | 4 ++-- debian/templates/image.meta.control.in | 12 +++++++++--- debian/templates/image.meta.maintscript.in | 1 - debian/templates/main.control.in | 4 ++-- debian/templates/sourcebin.control.in | 10 +++------- debian/templates/sourcebin.meta.maintscript.in | 1 - debian/templates/tools-versioned.control.in | 4 ++-- 13 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 debian/templates/headers.meta.maintscript.in delete mode 100644 debian/templates/image.meta.maintscript.in delete mode 100644 debian/templates/sourcebin.meta.maintscript.in diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index fcc67e9..3106984 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -336,19 +336,11 @@ class Gencontrol(Base): packages_meta = ( self.bundle.add('image.meta', ruleid, makeflags, vars, arch=arch) ) - assert len(packages_meta) == 1 packages_meta += ( self.bundle.add('headers.meta', ruleid, makeflags, vars, arch=arch) ) - assert len(packages_meta) == 2 - - if ( - config.defs_flavour.is_default - and not self.vars['source_suffix'] - ): - packages_meta[0].provides.append('linux-image-generic') - packages_meta[1].provides.append('linux-headers-generic') + assert len(packages_meta) > 0 packages_own.extend(packages_meta) diff --git a/debian/templates/config.control.in b/debian/templates/config.control.in index 0351a4a..5c57d1f 100644 --- a/debian/templates/config.control.in +++ b/debian/templates/config.control.in @@ -1,12 +1,10 @@ -Package: @source_basename@-config-@version@ +Package: krd-linux-config-@version@ Meta-Rules-Target: config Architecture: linux-any Build-Profiles: Multi-Arch: same Depends: ${misc:Depends} -Recommends: @source_basename@-source-@version@ -Description: Debian kernel configurations for Linux @version@ +Recommends: krd-linux-source-@version@ +Description: Kernel configurations for KrD's Linux kernel @version@ This package contains the configuration files used to build kernel files. - . - These can be used as a basis for configuring custom kernels. diff --git a/debian/templates/headers.control.in b/debian/templates/headers.control.in index e0a22ae..1809293 100644 --- a/debian/templates/headers.control.in +++ b/debian/templates/headers.control.in @@ -1,12 +1,12 @@ -Package: linux-headers-@abiname@@localversion@ +Package: krd-linux-headers-@abiname@@localversion@ Meta-Rules-Target: headers Build-Profiles: Depends: - linux-headers-@abiname@-common@localversion_headers@ (= ${source:Version}), - linux-image-@abiname@@localversion@ (= ${binary:Version}), - linux-kbuild-@abiname@, + krd-linux-headers-@abiname@-common@localversion_headers@ (= ${source:Version}), + krd-linux-image-@abiname@@localversion@ (= ${binary:Version}), + krd-linux-kbuild-@abiname@, ${misc:Depends} -Description: Header files for Linux @abiname@@localversion@ +Description: Header files for KrD's Linux kernel @abiname@@localversion@ This package provides the architecture-specific kernel header files for Linux kernel @abiname@@localversion@, generally used for building out-of-tree kernel modules. These files are going to be diff --git a/debian/templates/headers.featureset.control.in b/debian/templates/headers.featureset.control.in index cc7658f..25001b7 100644 --- a/debian/templates/headers.featureset.control.in +++ b/debian/templates/headers.featureset.control.in @@ -1,10 +1,10 @@ -Package: linux-headers-@abiname@-common@localversion@ +Package: krd-linux-headers-@abiname@-common@localversion@ Meta-Rules-Target: headers-common Build-Profiles: Architecture: all Depends: ${misc:Depends} Multi-Arch: foreign -Description: Common header files for Linux @abiname@@localversion@ +Description: Common header files for KrD's Linux kernel @abiname@@localversion@ This package provides the common kernel header files for Linux kernel version @abiname@@featureset_desc@, generally used for building out-of-tree kernel modules. These files are going to be installed into diff --git a/debian/templates/headers.meta.control.in b/debian/templates/headers.meta.control.in index e91e0e3..c22bca9 100644 --- a/debian/templates/headers.meta.control.in +++ b/debian/templates/headers.meta.control.in @@ -1,8 +1,8 @@ -Package: linux-headers@source_suffix@@localversion@ +Package: krd-linux-headers@localversion@ Meta-Rules-Target: meta -Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=linux-headers-@abiname@@localversion@ +Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=krd-linux-headers-@abiname@@localversion@ Build-Profiles: -Depends: linux-headers-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} -Description: Header files for Linux @flavour@ configuration (meta-package) +Depends: krd-linux-headers-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} +Description: Header files for KrD's Linux kernel @flavour@ configuration (meta-package) This package depends on the architecture-specific header files for the latest Linux kernel @flavour@ configuration. diff --git a/debian/templates/headers.meta.maintscript.in b/debian/templates/headers.meta.maintscript.in deleted file mode 100644 index a4ede22..0000000 --- a/debian/templates/headers.meta.maintscript.in +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/@package@ linux-headers-@abiname@@localversion@ 5.7~rc5-1~exp1 @package@ diff --git a/debian/templates/image.control.in b/debian/templates/image.control.in index d36f894..4d786d8 100644 --- a/debian/templates/image.control.in +++ b/debian/templates/image.control.in @@ -1,9 +1,9 @@ -Package: linux-image-@abiname@@localversion@ +Package: krd-linux-image-@abiname@@localversion@ Meta-Rules-Target: image Build-Profiles: Build-Depends: kmod, Depends: kmod, linux-base (>= 4.3~), ${misc:Depends} Suggests: firmware-linux-free, debian-kernel-handbook -Description: Linux @upstreamversion@ for @class@ +Description: KrD's Linux kernel image @upstreamversion@ for @class@ The Linux kernel @upstreamversion@ and modules for use on @longclass@. diff --git a/debian/templates/image.meta.control.in b/debian/templates/image.meta.control.in index b141c66..62417c8 100644 --- a/debian/templates/image.meta.control.in +++ b/debian/templates/image.meta.control.in @@ -1,9 +1,15 @@ -Package: linux-image@source_suffix@@localversion@ +Package: krd-linux-@localversion@ +Meta-Rules-Target: meta +Build-Profiles: +Depends: krd-linux-image@localversion@ (= ${binary:Version}), krd-linux-headers@localversion@ (= ${binary:Version}), ${misc:Depends} +Description: KrD's Linux kernel image and headers for @class@ (meta-package) + +Package: krd-linux-image@localversion@ Meta-Rules-Target: meta Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=linux-image-@abiname@@localversion@ Build-Profiles: -Depends: linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} +Depends: krd-linux-image-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} Provides: linux-latest-modules-@abiname@@localversion@, wireguard-modules (= 1.0.0), virtualbox-guest-modules [amd64] -Description: Linux for @class@ (meta-package) +Description: KrD's Linux kernel image for @class@ (meta-package) This package depends on the latest Linux kernel and modules for use on @longclass@. diff --git a/debian/templates/image.meta.maintscript.in b/debian/templates/image.meta.maintscript.in deleted file mode 100644 index f708b9c..0000000 --- a/debian/templates/image.meta.maintscript.in +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/@package@ linux-image-@abiname@@localversion@ 5.7~rc5-1~exp1 @package@ diff --git a/debian/templates/main.control.in b/debian/templates/main.control.in index 209a203..a717523 100644 --- a/debian/templates/main.control.in +++ b/debian/templates/main.control.in @@ -1,11 +1,11 @@ -Package: @source_basename@-support-@abiname@ +Package: krd-linux-support-@abiname@ Meta-Rules-Target: support Build-Profiles: Architecture: all Section: devel Depends: ${python3:Depends}, python3-dacite, python3-jinja2, ${misc:Depends} Multi-Arch: foreign -Description: Support files for Linux @upstreamversion@ +Description: Support files for KrD's Linux kernel @upstreamversion@ This package provides support files for the Linux kernel build, e.g. scripts to handle ABI information and for generation of build system meta data. diff --git a/debian/templates/sourcebin.control.in b/debian/templates/sourcebin.control.in index cfb2bee..2c515e6 100644 --- a/debian/templates/sourcebin.control.in +++ b/debian/templates/sourcebin.control.in @@ -1,16 +1,12 @@ -Package: @source_basename@-source-@version@ +Package: krd-linux-source-@version@ Meta-Rules-Target: source Build-Profiles: Architecture: all Section: kernel Build-Depends: patchutils, xz-utils Depends: binutils, xz-utils, ${misc:Depends} -Recommends: build-essential, bc, rsync, kmod, cpio, bison, flex, libelf-dev, libssl-dev, @source_basename@-config-@version@ +Recommends: build-essential, bc, rsync, kmod, cpio, bison, flex, libelf-dev, libssl-dev, krd-linux-config-@version@ Suggests: libncurses-dev | ncurses-dev, qtbase5-dev, pkg-config Multi-Arch: foreign -Description: Linux kernel source for version @version@ with Debian patches +Description: KrD's Linux kernel source for version @version@ with patches This package provides source code for the Linux kernel version @version@. - This source closely tracks official Linux kernel releases. Debian's - modifications to that source consist of security fixes, bug fixes, and - features that have already been (or are believed to be) accepted by the - upstream maintainers. diff --git a/debian/templates/sourcebin.meta.maintscript.in b/debian/templates/sourcebin.meta.maintscript.in deleted file mode 100644 index 9b8a862..0000000 --- a/debian/templates/sourcebin.meta.maintscript.in +++ /dev/null @@ -1 +0,0 @@ -dir_to_symlink /usr/share/doc/@package@ @source_basename@-source-@version@ 5.7~rc5-1~exp1 @package@ diff --git a/debian/templates/tools-versioned.control.in b/debian/templates/tools-versioned.control.in index 1e3ba7a..506f916 100644 --- a/debian/templates/tools-versioned.control.in +++ b/debian/templates/tools-versioned.control.in @@ -1,8 +1,8 @@ -Package: linux-kbuild-@abiname@ +Package: krd-linux-kbuild-@abiname@ Meta-Rules-Target: kbuild Build-Profiles: Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential Multi-Arch: foreign -Description: Kbuild infrastructure for Linux @abiname@ +Description: Kbuild infrastructure for KrD's Linux @abiname@ This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.