Merge branch 'meta-signed' into 'debian/latest'

Move meta packages back to signed source packages

See merge request kernel-team/linux!1776

debian/bin/gencontrol.py

@@ -425,14 +425,14 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
         packages_own.extend(packages_headers)
 
         if do_meta:
-            packages_own.extend(self.bundle.add('base.meta', ruleid, makeflags, vars, arch=arch))
+            packages_own.extend(bundle_signed.add('base.meta', ruleid, makeflags, vars, arch=arch))
 
             packages_meta = (
-                self.bundle.add('image.meta', ruleid, makeflags, vars, arch=arch)
+                bundle_signed.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)
+                bundle_signed.add('headers.meta', ruleid, makeflags, vars, arch=arch)
             )
             assert len(packages_meta) == 2
 
@@ -450,7 +450,7 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
         )
         if do_meta:
             packages_own.extend(
-                self.bundle.add('image-dbg.meta', ruleid, makeflags, vars, arch=arch)
+                bundle_signed.add('image-dbg.meta', ruleid, makeflags, vars, arch=arch)
             )
 
         if (

debian/changelog

@@ -5,6 +5,7 @@ linux (6.19~rc4-1~exp1) UNRELEASED; urgency=medium
   [ Bastian Blank ]
   * Fix installation of dtb into kernel-image udebs. (Closes: #1124961)
   * Split kernel modules into own package.
+  * Move meta packages back to signed source packages. (closes: #1124667)
 
   [ Aurelien Jarno ]
   * [riscv64] Enable ARCH_ANLOGIC and ARCH_TENSTORRENT

debian/salsa-ci.yml

@@ -326,6 +326,7 @@ build-signed:
     # by the build job
     paths:
       - ${WORKING_DIR}/linux-signed*-${BUILD_ARCH}_*
+      - ${WORKING_DIR}/linux-base-*_${BUILD_ARCH}.deb
       - ${WORKING_DIR}/linux-headers-*_${BUILD_ARCH}.deb
       - ${WORKING_DIR}/linux-headers-*-common_*_all.deb
       - ${WORKING_DIR}/linux-image-*_${BUILD_ARCH}.deb

debian/signing_templates/rules.real

@@ -11,6 +11,11 @@ export DEB_RULES_REQUIRES_ROOT ?= no
 GENCONTROL_ARGS := -v@signedtemplate_binaryversion@
 BUILDDEB_ARGS := -Zxz $(if $(filter pkg.linux.quick,$(DEB_BUILD_PROFILES)),-z0)
 
+packages_enabled := $(shell dh_listpackages)
+define if_package
+$(if $(filter $(1),$(packages_enabled)),$(2))
+endef
+
 stamp = [ -d $(dir $@) ] || mkdir $(dir $@); touch $@
 
 define dh_binary_pre
@@ -29,7 +34,7 @@ define dh_binary_post
 	# resolve the situation policy conformant.
 	# https://www.debian.org/doc/debian-policy/ch-docs.html#copyright-information
 	$(if $(INSTALLDOCS_LINK_DOC),
-		mkdir -p debian/$(PACKAGE_NAME)/usr/share/doc && ln -sf $(INSTALLDOCS_LINK_DOC) debian/$(PACKAGE_NAME)/usr/share/doc/$(PACKAGE_NAME),
+		$(foreach p,$(packages_enabled),DH_OPTIONS= dh_link -p$(p) usr/share/doc/$(INSTALLDOCS_LINK_DOC) usr/share/doc/$(p);),
 		dh_installdocs)
 	dh_installchangelogs
 	dh_installexamples

debian/source/lintian-overrides

@@ -20,4 +20,4 @@ linux source: source-contains-prebuilt-windows-binary *tools/perf/tests/pe-file.
 
 # Image depends on the correct version of images, which might be
 # signed.
-linux source: version-substvar-for-external-package Depends ${binary:Version} linux-image-*
+linux source: version-substvar-for-external-package Depends ${binary:Version} linux-image-* -> linux-base-*

debian/templates/base.meta.control.in

@@ -1,7 +1,7 @@
 Package: linux-base@source_suffix@@localversion@
 Meta-Rules-Target: meta
 Meta-Rules-Makeflags: INSTALLDOCS_LINK_DOC=linux-base-@abiname@@localversion@
-Build-Profiles: <!pkg.linux.nokernel>
+Build-Profiles: <!pkg.linux.nokernel !pkg.linux.nometa>
 Depends:
  linux-base-@abiname@@localversion@ (= ${binary:Version}),
  ${misc:Depends},

debian/templates/base.meta.lintian-overrides.j2

@@ -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
+{{package}}: usr-share-doc-symlink-to-foreign-package linux-base-{{abiname}}{{localversion}}

debian/templates/signed.source.lintian-overrides.in

@@ -1,7 +1,8 @@
 # linux-signed-* source packages are generated by the linux source
-# package, and produce binaries with the same versions, even in case
-# of a binNMU of linux
+# package, and produce binaries with the same versions
+linux-signed-@arch@ source: version-substvar-for-external-package Depends *${binary:Version} linux-base-* -> linux-base-*
 linux-signed-@arch@ source: version-substvar-for-external-package Depends *${binary:Version} linux-headers-* -> linux-headers-*
+linux-signed-@arch@ source: version-substvar-for-external-package Depends *${binary:Version} linux-image-* -> linux-image-*
 linux-signed-@arch@ source: version-substvar-for-external-package Depends *${binary:Version} linux-image-* -> linux-modules-*
 
 # The changelog is mostly copied from linux which is non-native