[linux] 02/05: udeb: Drop packages for modules that will later be signed

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 5a1dc1269013ab74714934e64983fe5e685ab446
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun May 29 14:11:57 2016 +0100

    udeb: Drop packages for modules that will later be signed
    
    These packages will be taken over by src:linux-signed.  Still do
    everything but building the packages so we find configuration
    errors before building linux-signed.
---
 debian/bin/gencontrol.py | 13 ++++++++++---
 debian/changelog         |  1 +
 debian/rules.real        |  2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 685f160..f859f08 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -192,6 +192,11 @@ class Gencontrol(Base):
             installer_def_dir = 'debian/installer'
             installer_arch_dir = os.path.join(installer_def_dir, arch)
             if os.path.isdir(installer_arch_dir):
+                # If we're going to build signed udebs later, don't actually
+                # generate udebs.  Just test that we *can* build, so we find
+                # configuration errors before building linux-signed.
+                test_build = self.config.merge('build', arch).get('signed-modules', False)
+
                 kw_env = os.environ.copy()
                 kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
                 kw_env['KW_CONFIG_DIR'] = installer_arch_dir
@@ -212,7 +217,8 @@ class Gencontrol(Base):
                 for package in udeb_packages:
                     package['Build-Profiles'] = '<!stage1>'
 
-                merge_packages(packages, udeb_packages, arch)
+                if not test_build:
+                    merge_packages(packages, udeb_packages, arch)
 
                 # These packages must be built after the per-flavour/
                 # per-featureset packages.  Also, this won't work
@@ -221,9 +227,10 @@ class Gencontrol(Base):
                     makefile.add(
                         'binary-arch_%s' % arch,
                         cmds=["$(MAKE) -f debian/rules.real install-udeb_%s %s "
-                              "PACKAGE_NAMES='%s'" %
+                              "PACKAGE_NAMES='%s' UDEB_UNSIGNED_TEST_BUILD=%s" %
                               (arch, makeflags,
-                               ' '.join(p['Package'] for p in udeb_packages))])
+                               ' '.join(p['Package'] for p in udeb_packages),
+                               test_build)])
 
     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 43c844c..636264b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux (4.6.1-2) UNRELEASED; urgency=medium
     linux-signed can easily replace them
   * Move merge_packages function from debian/bin/gencontrol.py to
     gencontrol module
+  * udeb: Drop packages for modules that will later be signed
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 Jun 2016 19:37:55 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 550cdb0..d14c508 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -466,8 +466,10 @@ install-udeb_$(ARCH):
 	kernel-wedge install-files $(ABINAME)
 	kernel-wedge check $(PACKAGE_NAMES)
 	dh_fixperms
+ifeq ($(UDEB_UNSIGNED_TEST_BUILD),False)
 	dh_gencontrol
 	dh_builddeb
+endif
 
 install-source: PACKAGE_NAME = $(SOURCE_PACKAGE_NAME)-source-$(VERSION)
 install-source: DH_OPTIONS = -p$(PACKAGE_NAME)

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