* debian/bin/gencontrol.py: Add special abiname setting for kpkg.

* debian/rules.real: Use KPKG_ABINAME.

svn path=/trunk/kernel/linux-2.6/; revision=3995

debian/bin/gencontrol.py

@@ -211,7 +211,7 @@ def parse_version(version):
     version_re = ur"""
 ^
 (?P<source>
-    (
+    (?:
         \d+\.\d+\.\d+\+
     )?
     (?P<upstream>
@@ -220,9 +220,11 @@ def parse_version(version):
             \.
             \d+
         )
-        (
+        (?:
             -
-            .+?
+            (?P<modifier>
+                .+?
+            )
         )?
     )
     -
@@ -361,12 +363,19 @@ def main():
     vars = {}
     vars = vars_changelog(vars, changelog)
 
-    version = changelog[0]['Version']
-
     c = config()
 
     vars.update(c['base'])
 
+    version = changelog[0]['Version']
+    if version['modifier'] is not None:
+        abiname = version['modifier']
+        kpkg_abiname = ""
+        vars['abiname'] = abiname
+    else:
+        abiname = c['base']['abiname']
+        kpkg_abiname = "-%s" % abiname
+
     arches = {}
     subarches_architecture = {}
     for arch in c['base']['arches']:
@@ -457,7 +466,11 @@ def main():
                 makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch_text, i, arch, subarch_text), None))
 
             subarch_makeflags = arch_makeflags[:]
-            subarch_makeflags.extend(["SUBARCH='%s'" % subarch_text, "ABINAME='%s'" % subarch_vars['abiname']])
+            subarch_makeflags.extend([
+                "SUBARCH='%s'" % subarch_text,
+                "ABINAME='%s'" % abiname,
+                "KPKG_ABINAME='%s'" % kpkg_abiname,
+            ])
             subarch_makeflags_clean = subarch_makeflags[:]
             if subarch_vars.has_key('kpkg-subarch'):
                 subarch_makeflags.append("KPKG_SUBARCH='%s'" % subarch_vars['kpkg-subarch'])

debian/rules.real

@@ -40,11 +40,11 @@ include debian/rules.defs
 # replaced by the flavour for which the command is run. 
 #
 kpkg_header := HEADER_CLEAN_HOOK='$(CURDIR)/$(BUILD_DIR)/header-install-$(ARCH)-$(SUBARCH)'
-kpkg_header += make-kpkg --append-to-version $(append)-$(ABINAME)
+kpkg_header += make-kpkg --append-to-version "$(append)$(KPKG_ABINAME)"
 kpkg_header += --arch $(ARCH)
 kpkg_header += --stem linux
 kpkg_header += --config defconfig
-kpkg_image := make-kpkg --append-to-version -$(ABINAME)-$(FLAVOUR)
+kpkg_image := make-kpkg --append-to-version "$(KPKG_ABINAME)-$(FLAVOUR)"
 kpkg_image += --arch $(ARCH)
 kpkg_image += --stem linux
 kpkg_image += --initrd