diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index f7485df..23119d2 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -448,11 +448,11 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur # transition to testing together. if do_meta: packages_meta = ( - bundle_signed.add('image.meta', ruleid, makeflags, vars, arch=arch) + self.bundle.add('image.meta', ruleid, makeflags, vars, arch=arch) ) assert len(packages_meta) == 1 packages_meta += ( - bundle_signed.add(build_signed and 'signed.headers.meta' or 'headers.meta', + self.bundle.add('signed.headers.meta' or 'headers.meta', ruleid, makeflags, vars, arch=arch) ) assert len(packages_meta) == 2 diff --git a/debian/changelog b/debian/changelog index 98b58a8..1ff566e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (6.6.15-9~tileos) bookworm; urgency=medium + + * Build metapackages for unsigned kernel + + -- Aleksey Samoilov Mon, 26 Feb 2024 03:18:07 +0400 + linux (6.6.15-8~tileos) bookworm; urgency=medium * Disable Debian Installer packages diff --git a/debian/linux-headers-amd64.lintian-overrides b/debian/linux-headers-amd64.lintian-overrides new file mode 100644 index 0000000..d2a7251 --- /dev/null +++ b/debian/linux-headers-amd64.lintian-overrides @@ -0,0 +1,3 @@ +# linux-signed-* source packages are generated by the linux source +# package, so it is OK for their binaries to share documentation +linux-headers-amd64: usr-share-doc-symlink-to-foreign-package linux-headers-6.6.15-amd64 diff --git a/debian/linux-headers-lts-amd64.lintian-overrides b/debian/linux-headers-lts-amd64.lintian-overrides new file mode 100644 index 0000000..cb4fa31 --- /dev/null +++ b/debian/linux-headers-lts-amd64.lintian-overrides @@ -0,0 +1,3 @@ +# linux-signed-* source packages are generated by the linux source +# package, so it is OK for their binaries to share documentation +linux-headers-lts-amd64: usr-share-doc-symlink-to-foreign-package linux-headers-6.6.15-amd64 diff --git a/debian/templates/headers.meta.control.in b/debian/templates/headers.meta.control.in index d5df832..1a1a38b 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: linux-headers-lts@source_suffix@@localversion@ Meta-Rules-Target: meta Meta-Rules-Makeflags-INSTALLDOCS_LINK_DOC: linux-headers-@abiname@@localversion@ Build-Profiles: Depends: linux-headers-@abiname@@localversion@ (= ${binary:Version}), ${misc:Depends} -Description: Header files for Linux @flavour@ configuration (meta-package) - This package depends on the architecture-specific header files for the latest +Description: Header files for Linux LTS @flavour@ configuration (meta-package) + This package depends on the architecture-specific header files for the LTS Linux kernel @flavour@ configuration. diff --git a/debian/templates/image.meta.control.in b/debian/templates/image.meta.control.in index 386dd78..f118d8a 100644 --- a/debian/templates/image.meta.control.in +++ b/debian/templates/image.meta.control.in @@ -1,9 +1,9 @@ -Package: linux-image@source_suffix@@localversion@ +Package: linux-image-lts@source_suffix@@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: linux-image-@abiname@@localversion@-unsigned (= ${binary:Version}), ${misc:Depends} Provides: linux-latest-modules-@abiname@@localversion@, wireguard-modules (= 1.0.0), virtualbox-guest-modules [amd64 i386] -Description: Linux for @class@ (meta-package) - This package depends on the latest Linux kernel and modules for use on +Description: Linux LTS for @class@ (meta-package) + This package depends on the LTS Linux kernel and modules for use on @longclass@.