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

[Bastian Blank]

Author: waldi
Date: Thu Dec 13 02:55:28 2007
New Revision: 9948

Log:
debian/bin/abicheck.py, debian/bin/abiupdate.py: Use full abinames.


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

Modified: dists/sid/linux-2.6/debian/bin/abicheck.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/abicheck.py	(original)
+++ dists/sid/linux-2.6/debian/bin/abicheck.py	Thu Dec 13 02:55:28 2007
@@ -5,14 +5,18 @@
 
 from debian_linux.abi import *
 from debian_linux.config import ConfigCoreDump
+from debian_linux.debian import *
 
 class checker(object):
     def __init__(self, dir, arch, featureset, flavour):
         self.arch, self.featureset, self.flavour = arch, featureset, flavour
         self.config = ConfigCoreDump(fp = file("debian/config.defines.dump"))
         self.filename_new = "%s/Module.symvers" % dir
+
+        changelog = Changelog(version = VersionLinux)[0]
+        version = changelog.version.linux_version
         abiname = self.config['abi',]['abiname']
-        self.filename_ref = "debian/abi/%s/%s_%s_%s" % (abiname, arch, featureset, flavour)
+        self.filename_ref = "debian/abi/%s-%s/%s_%s_%s" % (version,abiname, arch, featureset, flavour)
 
     def __call__(self, out):
         ret = 0

Modified: dists/sid/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/abiupdate.py	(original)
+++ dists/sid/linux-2.6/debian/bin/abiupdate.py	Thu Dec 13 02:55:28 2007
@@ -49,8 +49,7 @@
 
         local_config = ConfigCoreDump(fp = file("debian/config.defines.dump"))
 
-        self.abiname = local_config['abi',]['abiname']
-        self.version_abi = self.version + '-' + self.abiname
+        self.version_abi = self.version + '-' + local_config['abi',]['abiname']
 
     def __call__(self):
         self.dir = tempfile.mkdtemp(prefix = 'abiupdate')
@@ -103,7 +102,7 @@
         return filename_out
 
     def save_abi(self, symbols, arch, featureset, flavour):
-        dir = "debian/abi/%s" % self.abiname
+        dir = "debian/abi/%s" % self.version_abi
         if not os.path.exists(dir):
             os.makedirs(dir)
         out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)