[kernel] r17312 - dists/sid/linux-2.6/debian/bin

[Ben Hutchings]

Author: benh
Date: Sat May  7 03:46:03 2011
New Revision: 17312

Log:
Allow per-architecture ABI names

Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	Sat May  7 03:31:19 2011	(r17311)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Sat May  7 03:46:03 2011	(r17312)
@@ -41,6 +41,12 @@
         self._setup_makeflags(self.arch_makeflags, makeflags, config_base)
 
     def do_arch_packages(self, packages, makefile, arch, vars, makeflags, extra):
+        if self.version.linux_modifier is None:
+            try:
+                vars['abiname'] = '-%s' % self.config['abi', arch]['abiname']
+            except KeyError:
+                vars['abiname'] = self.abiname
+
         headers_arch = self.templates["control.headers.arch"]
         packages_headers_arch = self.process_packages(headers_arch, vars)