[kernel] r5354 - in people/waldi/linux-2.6/debian: . bin

[Bastian Blank]

Author: waldi
Date: Sun Jan  8 15:25:37 2006
New Revision: 5354

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/rules.real
Log:
* debian/bin/gencontrol.py: Calculate LOCALVERSION and LOCALVERSION_HEADERS.
* debian/rules.real: Remove LOCALVERSION.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Sun Jan  8 15:25:37 2006
@@ -83,6 +83,14 @@
         ):
             if config_entry.has_key(i[0]):
                 makeflags[i[1]] = config_entry[i[0]]
+        localversion = ''
+        localversion_headers = ''
+        if subarch != 'none':
+            localversion = '-' + subarch
+            localversion_headers = '-' + subarch
+        localversion += '-' + flavour
+        makeflags['LOCALVERSION'] = localversion
+        makeflags['LOCALVERSION_HEADERS'] = localversion_headers
 
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         image = self.templates["control.image"]

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Sun Jan  8 15:25:37 2006
@@ -17,12 +17,8 @@
 #
 ifeq ($(SUBARCH),none)
   basedir := debian/arch/$(ARCH)
-  LOCALVERSION := -$(FLAVOUR)
-  LOCALVERSION_HEADERS :=
 else
   basedir := debian/arch/$(ARCH)/$(SUBARCH)
-  LOCALVERSION := -$(SUBARCH)-$(FLAVOUR)
-  LOCALVERSION_HEADERS := -$(SUBARCH)
 endif
 
 -include $(basedir)/Makefile.inc