[linux-signed] 01/03: gencontrol.py: Define ABINAME makefile variable for per-architecture rules

[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-signed.

commit 2666d8481d3c3f8ee576593a8cdf82e2784111fc
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Tue Jun 7 19:03:04 2016 +0100

    gencontrol.py: Define ABINAME makefile variable for per-architecture rules
    
    This is consistent with gencontrol.py in src:linux and is needed for udeb
    building.
---
 debian/bin/gencontrol.py | 11 ++++++-----
 debian/changelog         |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index f0f2359..7f768a0 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -39,6 +39,12 @@ class Gencontrol(Base):
         packages['source']['Build-Depends'].append(
             'linux-support-%(abiname)s (= %(imageversion)s)' % vars)
 
+    def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
+        if self.version.linux_modifier is None:
+            abiname_part = '-%s' % self.config.merge('abi', arch)['abiname']
+            makeflags['ABINAME'] = vars['abiname'] = \
+                self.config['version', ]['abiname_base'] + abiname_part
+
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
         super(Gencontrol, self).do_flavour_setup(vars, makeflags, arch, featureset, flavour, extra)
 
@@ -50,11 +56,6 @@ class Gencontrol(Base):
                 .get('signed-modules', False)):
             return
 
-        try:
-            vars['abiname'] = '-%s' % self.config['abi', arch]['abiname']
-        except KeyError:
-            vars['abiname'] = self.abiname
-        makeflags['ABINAME'] = vars['abiname']
         makeflags['IMAGEVERSION'] = vars['imageversion']
 
         packages['source']['Build-Depends'].append(
diff --git a/debian/changelog b/debian/changelog
index 1200adc..585c3b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-signed (2) UNRELEASED; urgency=medium
+
+  * gencontrol.py: Define ABINAME makefile variable for per-architecture rules
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Wed, 08 Jun 2016 23:35:38 +0100
+
 linux-signed (1.1) unstable; urgency=medium
 
   * Fix attachment of module signatures

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