[linux] 05/06: gencontrol.py: add support for disabling libc-dev package

[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 6759b9a57e44a9eacdba65389e53390529a2ee1a
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Thu Nov 12 23:02:36 2015 +0100

    gencontrol.py: add support for disabling libc-dev package
---
 debian/bin/gencontrol.py | 13 +++++++++----
 debian/rules.real        |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 0e830fe..e5ab76d 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -45,6 +45,7 @@ class Gencontrol(Base):
         'packages': {
             'docs': config.SchemaItemBoolean(),
             'installer': config.SchemaItemBoolean(),
+            'libc-dev': config.SchemaItemBoolean(),
 
         }
     }
@@ -151,12 +152,16 @@ class Gencontrol(Base):
         else:
             headers_arch = self.templates["control.headers.arch"]
             packages_headers_arch = self.process_packages(headers_arch, vars)
+            packages_headers_arch[-1]['Depends'].extend(PackageRelation())
+            extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends']
+
+        if self.config.merge('packages').get('libc-dev', True):
+            libc_dev = self.templates["control.libc-dev"]
+            packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
+        else:
+            makeflags['DO_LIBC'] = False
 
-        libc_dev = self.templates["control.libc-dev"]
-        packages_headers_arch[0:0] = self.process_packages(libc_dev, {})
 
-        packages_headers_arch[-1]['Depends'].extend(PackageRelation())
-        extra['headers_arch_depends'] = packages_headers_arch[-1]['Depends']
 
         self.merge_packages(packages, packages_headers_arch, arch)
 
diff --git a/debian/rules.real b/debian/rules.real
index 62d8072..403bfe0 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -53,7 +53,9 @@ MAKEOVERRIDES =
 ifneq ($(FOREIGN_KERNEL),True)
   binary-arch-arch: install-headers_$(ARCH)
 endif
-binary-arch-arch: install-libc-dev_$(ARCH)
+ifneq ($(DO_LIBC),False)
+  binary-arch-arch: install-libc-dev_$(ARCH)
+endif
 binary-arch-featureset: install-headers_$(ARCH)_$(FEATURESET)
 binary-arch-flavour: install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
 ifeq ($(DEBUG),True)

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