[linux-latest] 03/07: debian/rules.real: Introduce install-flavour rule for building per-flavour 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 sid
in repository linux-latest.

commit 21d38fe8c505cd573377f3510b937c23b7ad7a7c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Aug 31 02:12:05 2016 +0100

    debian/rules.real: Introduce install-flavour rule for building per-flavour packages
    
    This is preparation for handling debug-symbol meta-packages specially.
    Instead of setting DH_OPTIONS in debian/rules.gen, just set a DEBUG
    flag for the one optional per-flavour package.
---
 debian/bin/gencontrol.py | 16 +++++++++-------
 debian/rules.real        |  8 ++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 4e1c723..15c1b11 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -78,6 +78,7 @@ class Gencontrol(Base):
         templates.extend(self.templates["control.headers.latest"])
         if self.config.get_merge('build', arch, featureset, flavour,
                                  'debug-info', False):
+            makeflags['DEBUG'] = True
             templates.extend(self.templates["control.image-dbg.latest"])
             substitute_file('lintian-overrides.image-dbg',
                             'debian/linux-image-%s-dbg.lintian-overrides' %
@@ -101,12 +102,12 @@ class Gencontrol(Base):
             if self.config.merge('xen', arch, featureset, flavour):
                 templates.extend(self.templates["control.xen-linux-system.latest"])
 
-        packages_dummy = []
+        packages_flavour = []
 
-        packages_dummy.append(self.process_real_image(templates[0], image_fields, vars))
-        packages_dummy.extend(self.process_packages(templates[1:], vars))
+        packages_flavour.append(self.process_real_image(templates[0], image_fields, vars))
+        packages_flavour.extend(self.process_packages(templates[1:], vars))
 
-        for package in packages_dummy:
+        for package in packages_flavour:
             name = package['Package']
             if name in packages:
                 package = packages.get(name)
@@ -118,16 +119,17 @@ class Gencontrol(Base):
         makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
 
         cmds_binary_arch = []
-        for i in packages_dummy:
+        for i in packages_flavour:
             cmds_binary_arch += self.get_link_commands(i, ['NEWS'])
-        cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags)]
+        cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-flavour %s" %
+                             makeflags]
         makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_binary_arch)
 
         # linux-image meta-packages include a bug presubj message
         # directing reporters to the real image package.
         bug_presubj = self.substitute(
             self.templates["bug-presubj.image.latest"], vars)
-        codecs.open("debian/%s.bug-presubj" % packages_dummy[0]['Package'], 'w', 'utf-8').write(bug_presubj)
+        codecs.open("debian/%s.bug-presubj" % packages_flavour[0]['Package'], 'w', 'utf-8').write(bug_presubj)
 
     def do_extra(self, packages, makefile):
         templates_extra = self.templates["control.extra"]
diff --git a/debian/rules.real b/debian/rules.real
index 33bad17..5f17a23 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -50,3 +50,11 @@ install-perf: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-perf:
 	dh_prep
 	$(MAKE) -f debian/rules.real install-base
+
+install-flavour:
+	dh_testdir
+	dh_testroot
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION) -plinux-headers$(LOCALVERSION)'
+ifeq ($(DEBUG),True)
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION)-dbg'
+endif

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