[kernel] r9658 - dists/trunk/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Sun Oct 14 00:53:38 2007
New Revision: 9658

Log:
debian/bin/abicheck.py, debian/bin/abiupdate.py: Move abifiles to debian/abi.


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

Modified: dists/trunk/linux-2.6/debian/bin/abicheck.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abicheck.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/abicheck.py	Sun Oct 14 00:53:38 2007
@@ -9,10 +9,7 @@
         self.config = ConfigReaderCore(["debian/config"])
         self.filename_new = "%s/Module.symvers" % dir
         abiname = self.config['abi',]['abiname']
-        if featureset == 'none':
-            self.filename_ref = "debian/config/%s/abi-%s.%s" % (arch, abiname, flavour)
-        else:
-            self.filename_ref = "debian/config/%s/%s/abi-%s.%s" % (arch, featureset, abiname, flavour)
+        self.filename_ref = "debian/abi/%s/%s_%s_%s" % (abiname, arch, featureset, flavour)
 
     def __call__(self, out):
         ret = 0

Modified: dists/trunk/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/abiupdate.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/abiupdate.py	Sun Oct 14 00:53:38 2007
@@ -107,10 +107,10 @@
         return filename_out
 
     def save_abi(self, symbols, arch, featureset, flavour):
-        out = "debian/config/%s" % arch
-        if featureset != 'none':
-            out += "/%s" % featureset
-        out += "/abi-%s.%s" % (self.abiname, flavour)
+        dir = "debian/abi/%s" % self.abiname
+        if not os.path.exists(dir):
+            os.makedirs(dir)
+        out = "%s/%s_%s_%s" % (dir, arch, featureset, flavour)
         symbols.write(file(out, 'w'))
 
     def update_arch(self, config, arch):