[kernel] r19551 - in dists/trunk/linux/debian: . bin

[Bastian Blank]

Author: waldi
Date: Tue Nov 27 18:39:04 2012
New Revision: 19551

Log:
debian/bin/gencontrol.py, debian/rules.real:
Remove remaining code for s390 tape images.

Modified:
   dists/trunk/linux/debian/bin/gencontrol.py
   dists/trunk/linux/debian/rules.real

Modified: dists/trunk/linux/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux/debian/bin/gencontrol.py	Tue Nov 27 18:30:43 2012	(r19550)
+++ dists/trunk/linux/debian/bin/gencontrol.py	Tue Nov 27 18:39:04 2012	(r19551)
@@ -266,10 +266,7 @@
         packages_dummy = []
         packages_own = []
 
-        if config_entry_image['type'] == 'plain-s390-tape':
-            image = self.templates["control.image.type-standalone"]
-        else:
-            image = self.templates["control.image.type-%s" % config_entry_image['type']]
+        image = self.templates["control.image.type-%s" % config_entry_image['type']]
 
         config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
         if config_entry_xen:

Modified: dists/trunk/linux/debian/rules.real
==============================================================================
--- dists/trunk/linux/debian/rules.real	Tue Nov 27 18:30:43 2012	(r19550)
+++ dists/trunk/linux/debian/rules.real	Tue Nov 27 18:39:04 2012	(r19551)
@@ -156,12 +156,7 @@
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE): $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape: BUILD_TARGET = image
-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390x-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-s390x-tape:
 	+$(MAKE_CLEAN) -C '$(DIR)' $(BUILD_TARGET)
 	python debian/bin/buildcheck.py $(DIR) $(ARCH) $(FEATURESET) $(FLAVOUR)
 	@$(stamp)
@@ -462,14 +457,6 @@
 	chmod 755 $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/script
 	echo "RELEASE='$(REAL_VERSION)'" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
 
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-s390-tape:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs 'boot'
-	install -m644 '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
-	+$(MAKE_SELF) install-base
-
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)