[linux] 01/02: Disable MODULE_SIG for architectures not supported by linux-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 cab1f743c868c0b6a6f73037785c9c2f4f0e3639
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Jun 6 18:12:47 2016 +0100

    Disable MODULE_SIG for architectures not supported by linux-signed
---
 debian/bin/gencontrol.py | 5 ++++-
 debian/changelog         | 1 +
 debian/config/config     | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index f4ef6fc..b87be73 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -442,8 +442,11 @@ class Gencontrol(Base):
         kconfig.extend(check_config("%s/%s/config" % (arch, featureset), False, arch, featureset))
         kconfig.extend(check_config("%s/%s/config.%s" % (arch, featureset, flavour), False, arch, featureset, flavour))
         makeflags['KCONFIG'] = ' '.join(kconfig)
+        makeflags['KCONFIG_OPTIONS'] = ''
         if build_debug:
-            makeflags['KCONFIG_OPTIONS'] = '-o DEBUG_INFO=y'
+            makeflags['KCONFIG_OPTIONS'] += ' -o DEBUG_INFO=y'
+        if config_entry_build.get('signed-modules'):
+            makeflags['KCONFIG_OPTIONS'] += ' -o MODULE_SIG=y'
 
         cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags]
         if packages_dummy:
diff --git a/debian/changelog b/debian/changelog
index 010228b..985a998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ linux (4.6.1-1~exp1) UNRELEASED; urgency=medium
   * debian/control: Drop obsolete versioned Depends and Breaks
   * linux-libc-dev: Drop obsolete Replaces/Conflicts with linux-kernel-headers
   * debian/control: Update policy version to 3.9.8; no changes required
+  * Disable MODULE_SIG for architectures not supported by linux-signed
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 04 Jun 2016 18:33:11 +0100
 
diff --git a/debian/config/config b/debian/config/config
index bf5bb5c..4b8c853 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5575,7 +5575,8 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_MODULE_SIG=y
+#. This is overridden if the [build]signed-modules setting is enabled
+# CONFIG_MODULE_SIG is not set
 #. Signature validation is a run-time option
 # CONFIG_MODULE_SIG_FORCE is not set
 #. Signatures are added in linux-signed

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