[kernel] r10254 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Tue Jan 29 14:31:16 2008
New Revision: 10254

Log:
debian/bin/gencontrol.py:
Move some linux specific code from ebian/lib/python/debian_linux/gencontrol.py.


Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Tue Jan 29 14:31:16 2008
@@ -18,6 +18,10 @@
         super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
         vars.update(self.config['image',])
         makeflags.update({
+            'MAJOR': self.version.linux_major,
+            'VERSION': self.version.linux_version,
+            'UPSTREAMVERSION': self.version.linux_upstream,
+            'ABINAME': self.abiname,
             'SOURCEVERSION': self.version.complete,
         })
 
@@ -262,7 +266,13 @@
             self.abiname = ''
         else:
             self.abiname = '-%s' % self.config['abi',]['abiname']
-        self.vars = self.process_version_linux(self.version, self.abiname)
+        self.vars = {
+            'upstreamversion': self.version.linux_upstream,
+            'version': self.version.linux_version,
+            'source_upstream': self.version.upstream,
+            'major': self.version.linux_major,
+            'abiname': self.abiname,
+        }
         self.config['version',] = {'source': self.version.complete, 'abiname': self.abiname}
 
     def process_real_image(self, in_entry, relations, config, vars):

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Tue Jan 29 14:31:16 2008
@@ -108,12 +108,7 @@
             self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
 
     def do_main_setup(self, vars, makeflags, extra):
-        makeflags.update({
-            'MAJOR': self.version.linux_major,
-            'VERSION': self.version.linux_version,
-            'UPSTREAMVERSION': self.version.linux_upstream,
-            'ABINAME': self.abiname,
-        })
+        pass
 
     def do_main_makefile(self, makefile, makeflags, extra):
         makefile.add('binary-indep', cmds = ["$(MAKE) -f debian/rules.real binary-indep %s" % makeflags])
@@ -280,15 +275,6 @@
             entries.append(self.process_package(i, vars))
         return entries
 
-    def process_version_linux(self, version, abiname):
-        return {
-            'upstreamversion': version.linux_upstream,
-            'version': version.linux_version,
-            'source_upstream': version.upstream,
-            'major': version.linux_major,
-            'abiname': abiname,
-        }
-
     def substitute(self, s, vars):
         if isinstance(s, (list, tuple)):
             for i in xrange(len(s)):