[kernel] r10664 - in dists/sid/linux-2.6/debian: . bin config/s390

[Bastian Blank]

Author: waldi
Date: Tue Feb 26 13:43:29 2008
New Revision: 10664

Log:
* debian/bin/gencontrol.py: Add minimal support for localversion overrides.
* debian/changelog: Update.
* debian/config/s390/defines: Override localversion for tape image.
* debian/rules.real: Don't build modules for plain-s390-tape.


Modified:
   dists/sid/linux-2.6/debian/bin/gencontrol.py
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/s390/defines
   dists/sid/linux-2.6/debian/rules.real

Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Tue Feb 26 13:43:29 2008
@@ -78,7 +78,15 @@
         makefile.add('source_%s_%s_real' % (arch, featureset), cmds = cmds_source)
 
     def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour, extra):
-        vars.update(self.config.merge('image', arch, featureset, flavour))
+        config_image = self.config.merge('image', arch, featureset, flavour)
+
+        vars.update(config_image)
+
+        vars['localversion-image'] = vars['localversion']
+        override_localversion = config_image.get('override-localversion', None)
+        if override_localversion is not None:
+            vars['localversion-image'] = vars['localversion_headers'] + '-' + override_localversion
+
         for i in (
             ('cflags', 'CFLAGS'),
             ('compiler', 'COMPILER'),
@@ -87,6 +95,7 @@
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
             ('localversion', 'LOCALVERSION'),
+            ('localversion-image', 'LOCALVERSION_IMAGE'),
             ('override-host-type', 'OVERRIDE_HOST_TYPE'),
             ('type', 'TYPE'),
         ):

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Feb 26 13:43:29 2008
@@ -1,9 +1,13 @@
 linux-2.6 (2.6.24-5) UNRELEASED; urgency=low
 
+  [ Gordon Farquharson ]
   * [arm] Enable asix driver (USB_NET_AX8817X).
   * [arm] Enable CONFIG_USB_CATC, CONFIG_USB_KAWETH, CONFIG_USB_PEGASUS,
           and CONFIG_USB_RTL8150.
 
+  [ Bastian Blank ]
+  * [s390/s390-tape]: Override localversion correctly.
+
  -- Gordon Farquharson <gordonfarquharson at gmail.com>  Thu, 21 Feb 2008 21:00:48 -0700
 
 linux-2.6 (2.6.24-4) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/s390/defines	(original)
+++ dists/sid/linux-2.6/debian/config/s390/defines	Tue Feb 26 13:43:29 2008
@@ -22,6 +22,7 @@
 [s390-tape_image]
 desc: This kernel has support to IPL (boot) from a tape.
 initramfs: false
+override-localversion: s390
 type: plain-s390-tape
 
 [s390x_base]

Modified: dists/sid/linux-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-2.6/debian/rules.real	(original)
+++ dists/sid/linux-2.6/debian/rules.real	Tue Feb 26 13:43:29 2008
@@ -104,7 +104,7 @@
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
 	cp '$(CONFIG)' '$(DIR)/.config'
-	echo '$(ABINAME)$(LOCALVERSION)' > '$(DIR)/localversion'
+	echo '$(ABINAME)$(LOCALVERSION_IMAGE)' > '$(DIR)/localversion'
 	echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
 	echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
 	echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
@@ -147,10 +147,12 @@
 	python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'
 
+$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape: BUILD_TARGET = image
+
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape \
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
-	$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG)
+	$(MAKE_CLEAN) -C '$(DIR)' $(JOBS_ARG) $(BUILD_TARGET)
 	python debian/bin/abicheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	touch '$@'