[linux] 02/02: debian/rules.real: Build a linux-code-sign tarball for signing by dak

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch benh/byhand-code-sign
in repository linux.

commit 53ed8ed95703e23ac2d57b20bfa428fc47e38704
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Apr 16 19:06:14 2017 +0100

    debian/rules.real: Build a linux-code-sign tarball for signing by dak
---
 debian/bin/gencontrol.py |  4 ++++
 debian/changelog         |  1 +
 debian/rules.real        | 15 +++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 5302e56..cd1811f 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -262,6 +262,10 @@ class Gencontrol(Base):
                               (arch, makeflags,
                                ' '.join(p['Package'] for p in udeb_packages),
                                test_build)])
+                makefile.add(
+                    'binary-arch_%s' % arch,
+                    cmds=["$(MAKE) -f debian/rules.real install-code-sign_%s %s" %
+                          (arch, makeflags)])
 
     def do_featureset_setup(self, vars, makeflags, arch, featureset, extra):
         config_base = self.config.merge('base', arch, featureset)
diff --git a/debian/changelog b/debian/changelog
index d539700..2a337d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ linux (4.9.18-2) UNRELEASED; urgency=medium
   * [powerpc/powerpc-smp,powerpcspe] Explicitly set NR_CPUS=4
   * Move debug symbols back to the main archive, to avoid problems with the
     current handling in dak
+  * debian/rules.real: Build a linux-code-sign tarball for signing by dak
 
   [ Salvatore Bonaccorso ]
   * ping: implement proper locking (CVE-2017-2671)
diff --git a/debian/rules.real b/debian/rules.real
index 37da264..bc5ef7a 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -487,6 +487,21 @@ endif
 	ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
 	+$(MAKE_SELF) install-base
 
+install-code-sign_$(ARCH): TARBALL=linux-code-sign_$(SOURCEVERSION)_$(ARCH).tar.xz
+install-code-sign_$(ARCH):
+ifneq ($(wildcard debian/linux-image-*-unsigned),)
+	{ cd debian; \
+	  for dir in linux-image-*-unsigned; do \
+		grep -l '^CONFIG_EFI_STUB=y' $$dir/boot/config-* | \
+		xargs -r grep -l '^CONFIG_EFI_SECURE_BOOT_SECURELEVEL=y' | \
+		sed 's|/config-|/vmlinuz-|'; \
+		find $$dir/lib/modules -name '*.ko'; \
+	  done \
+	  | tar --no-recursion -T - -c --xz -f -; } \
+	> ../$(TARBALL)
+	dpkg-distaddfile $(TARBALL) byhand extra
+endif
+
 install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
 install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
 install-udeb_$(ARCH): DH_OPTIONS=$(PACKAGE_NAMES:%=-p%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git