[linux] 04/06: gencontrol.py: add support for disabling installer packages

[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 1f9192267c295f9e95df411967a967fe28406dba
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Thu Nov 12 21:33:20 2015 +0100

    gencontrol.py: add support for disabling installer packages
---
 debian/bin/gencontrol.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index d7fea7a..0e830fe 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -44,6 +44,8 @@ class Gencontrol(Base):
         },
         'packages': {
             'docs': config.SchemaItemBoolean(),
+            'installer': config.SchemaItemBoolean(),
+
         }
     }
 
@@ -173,7 +175,7 @@ class Gencontrol(Base):
                 warnings.warn('Disable installer modules on request (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
             else:
                 raise RuntimeError('Unable to disable installer modules in release build (DEBIAN_KERNEL_DISABLE_INSTALLER set)')
-        else:
+        elif self.config.merge('packages').get('installer', True):
             # Add udebs using kernel-wedge
             installer_def_dir = 'debian/installer'
             installer_arch_dir = os.path.join(installer_def_dir, arch)

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