[kernel] r22199 - in dists/sid/linux/debian: . bin

[Ben Hutchings]

Author: benh
Date: Mon Dec 15 22:01:58 2014
New Revision: 22199

Log:
Fix inconsistent ABI name generation in debian/bin/{abiupdate,buildcheck,gencontrol}.py (Closes: #773233)

Modified:
   dists/sid/linux/debian/bin/abiupdate.py
   dists/sid/linux/debian/bin/buildcheck.py
   dists/sid/linux/debian/bin/gencontrol.py
   dists/sid/linux/debian/changelog

Modified: dists/sid/linux/debian/bin/abiupdate.py
==============================================================================
--- dists/sid/linux/debian/bin/abiupdate.py	Sun Dec 14 11:08:03 2014	(r22198)
+++ dists/sid/linux/debian/bin/abiupdate.py	Mon Dec 15 22:01:58 2014	(r22199)
@@ -68,9 +68,9 @@
         self.version = changelog.version.linux_version
         self.version_source = changelog.version.complete
 
-        local_config = ConfigCoreDump(fp=open("debian/config.defines.dump", "rb"))
+        self.config = ConfigCoreDump(fp=open("debian/config.defines.dump", "rb"))
 
-        self.version_abi = local_config['version', ]['abiname']
+        self.version_abi = self.config['version', ]['abiname']
 
     def __call__(self):
         self.dir = tempfile.mkdtemp(prefix='abiupdate')
@@ -99,13 +99,18 @@
         return base_out
 
     def get_abi(self, arch, prefix):
-        filename = "linux-headers-%s-%s_%s_%s.deb" % (self.version_abi, prefix, self.version_source, arch)
+        try:
+            version_abi = (self.config['version',]['abiname_base'] + '-' +
+                           self.config['abi', arch]['abiname'])
+        except KeyError:
+            version_abi = self.version_abi
+        filename = "linux-headers-%s-%s_%s_%s.deb" % (version_abi, prefix, self.version_source, arch)
         f = self.retrieve_package(self.url, filename, arch)
         d = self.extract_package(f, "linux-headers-%s_%s" % (prefix, arch))
-        f1 = d + "/usr/src/linux-headers-%s-%s/Module.symvers" % (self.version_abi, prefix)
+        f1 = d + "/usr/src/linux-headers-%s-%s/Module.symvers" % (version_abi, prefix)
         s = Symbols(open(f1))
         shutil.rmtree(d)
-        return s
+        return version_abi, s
 
     def get_config(self):
         filename = "linux-support-%s_%s_all.deb" % (self.version_abi, self.version_source)
@@ -129,8 +134,8 @@
             f_out.write(r)
         return filename_out
 
-    def save_abi(self, symbols, arch, featureset, flavour):
-        dir = "debian/abi/%s" % self.version_abi
+    def save_abi(self, version_abi, symbols, arch, featureset, flavour):
+        dir = "debian/abi/%s" % version_abi
         if not os.path.exists(dir):
             os.makedirs(dir)
         out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)
@@ -170,8 +175,8 @@
             else:
                 localversion = featureset + '-' + flavour
 
-            abi = self.get_abi(arch, localversion)
-            self.save_abi(abi, arch, featureset, flavour)
+            version_abi, abi = self.get_abi(arch, localversion)
+            self.save_abi(version_abi, abi, arch, featureset, flavour)
             self.log("Ok.\n")
         except HTTPError as e:
             self.log("Failed to retrieve %s: %s\n" % (e.filename, e))

Modified: dists/sid/linux/debian/bin/buildcheck.py
==============================================================================
--- dists/sid/linux/debian/bin/buildcheck.py	Sun Dec 14 11:08:03 2014	(r22198)
+++ dists/sid/linux/debian/bin/buildcheck.py	Mon Dec 15 22:01:58 2014	(r22199)
@@ -44,13 +44,11 @@
 
         self.filename_new = "%s/Module.symvers" % dir
 
-        upstream_version = self.config['version',]['upstream']
         try:
-            version_abi = (upstream_version + '-' +
+            version_abi = (self.config['version',]['abiname_base'] + '-' +
                            self.config['abi', arch]['abiname'])
         except KeyError:
-            version_abi = (upstream_version + '-' +
-                           self.config['abi', ]['abiname'])
+            version_abi = self.config['version',]['abiname']
         self.filename_ref = "debian/abi/%s/%s_%s_%s" % (version_abi, arch, featureset, flavour)
 
     def __call__(self, out):

Modified: dists/sid/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux/debian/bin/gencontrol.py	Sun Dec 14 11:08:03 2014	(r22198)
+++ dists/sid/linux/debian/bin/gencontrol.py	Mon Dec 15 22:01:58 2014	(r22199)
@@ -477,6 +477,7 @@
         }
         self.config['version', ] = {'source': self.version.complete,
                                     'upstream': self.version.linux_upstream,
+                                    'abiname_base': self.abiname_version,
                                     'abiname': (self.abiname_version +
                                                 self.abiname_part)}
 

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Sun Dec 14 11:08:03 2014	(r22198)
+++ dists/sid/linux/debian/changelog	Mon Dec 15 22:01:58 2014	(r22199)
@@ -2,6 +2,8 @@
 
   [ Ben Hutchings ]
   * [sh4] Build with gcc-4.8 (Closes: #772602)
+  * Fix inconsistent ABI name generation in
+    debian/bin/{abiupdate,buildcheck,gencontrol}.py (Closes: #773233)
 
   [ Ian Campbell ]
   * [armhf] Enable support for support OMAP5432 uEVM by enabling: