From a25eb38372031518e13e753a5011072bde51e9ef Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 5 Apr 2018 22:30:30 +0200
Subject: [PATCH] debian/config: Rename [build]signed-modules setting to
 signed-code

This setting controls code signing in general, not just modules.
---
 debian/bin/gencontrol.py | 6 +++---
 debian/changelog         | 1 +
 debian/config/config     | 2 +-
 debian/config/defines    | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index df430536e..8c7e93cab 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -25,7 +25,7 @@ class Gencontrol(Base):
         },
         'build': {
             'debug-info': config.SchemaItemBoolean(),
-            'signed-modules': config.SchemaItemBoolean(),
+            'signed-code': config.SchemaItemBoolean(),
             'vdso': config.SchemaItemBoolean(),
         },
         'description': {
@@ -229,7 +229,7 @@ class Gencontrol(Base):
                 # 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)
+                test_build = self.config.merge('build', arch).get('signed-code', False)
 
                 kw_env = os.environ.copy()
                 kw_env['KW_DEFCONFIG_DIR'] = installer_def_dir
@@ -386,7 +386,7 @@ class Gencontrol(Base):
         packages_dummy = []
         packages_own = []
 
-        build_signed = config_entry_build.get('signed-modules')
+        build_signed = config_entry_build.get('signed-code')
 
         image = self.templates[build_signed and "control.image-unsigned"
                                or "control.image"]
diff --git a/debian/changelog b/debian/changelog
index 947d74345..803c6f9cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ linux (4.16-1~exp1) UNRELEASED; urgency=medium
 
   [ Ben Hutchings ]
   * Set ABI name to trunk
+  * debian/config: Rename [build]signed-modules setting to signed-code
 
  -- Roger Shimizu <rogershimizu@gmail.com>  Fri, 23 Mar 2018 21:10:34 +0900
 
diff --git a/debian/config/config b/debian/config/config
index 54e208ed2..259ccb02d 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5942,7 +5942,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-#. This is overridden if the [build]signed-modules setting is enabled
+#. This is overridden if the [build]signed-code setting is enabled
 # CONFIG_MODULE_SIG is not set
 #. Signature validation is a run-time option
 # CONFIG_MODULE_SIG_FORCE is not set
diff --git a/debian/config/defines b/debian/config/defines
index 80f12bd29..c7704039e 100644
--- a/debian/config/defines
+++ b/debian/config/defines
@@ -109,8 +109,8 @@ featuresets:
 
 [build]
 debug-info: true
-# Disable module signing by default; this can be overridden per-architecture
-signed-modules: false
+# Disable code signing by default; this can be overridden per-architecture
+signed-code: false
 
 [featureset-rt_base]
 enabled: false