[kernel] r18504 - in dists/trunk/linux-2.6/debian: . bin templates

[Bastian Blank]

Author: waldi
Date: Wed Jan 11 21:13:47 2012
New Revision: 18504

Log:
debian/bin/gencontrol.py, debian/rules.real, debian/templates:
Remove support for plain-xen image type.

Deleted:
   dists/trunk/linux-2.6/debian/templates/image.xen.postinst.in
   dists/trunk/linux-2.6/debian/templates/image.xen.postrm.in
   dists/trunk/linux-2.6/debian/templates/image.xen.prerm.in
Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/rules.real

Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	Wed Jan 11 21:04:17 2012	(r18503)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Wed Jan 11 21:13:47 2012	(r18504)
@@ -274,11 +274,6 @@
 
         self.merge_packages(packages, packages_own + packages_dummy, arch)
 
-        if config_entry_image['type'] == 'plain-xen':
-            for i in ('postinst', 'postrm', 'prerm'):
-                j = self.substitute(self.templates["image.xen.%s" % i], vars)
-                file("debian/%s.%s" % (packages_own[0]['Package'], i), 'w').write(j)
-
         def get_config(*entry_name):
             entry_real = ('image',) + entry_name
             entry = self.config.get(entry_real, None)

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Wed Jan 11 21:04:17 2012	(r18503)
+++ dists/trunk/linux-2.6/debian/rules.real	Wed Jan 11 21:13:47 2012	(r18504)
@@ -129,8 +129,7 @@
 
 $(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 \
-$(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
+$(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)
@@ -439,26 +438,6 @@
 	install -m644 '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
 	+$(MAKE_SELF) install-base
 
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: MODULES_PACKAGE_DIR = debian/$(MODULES_PACKAGE_NAME)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen: DH_OPTIONS =
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain-xen:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs -p$(PACKAGE_NAME) boot 'var/lib/$(PACKAGE_NAME)'
-	dh_installdirs -p$(MODULES_PACKAGE_NAME) boot
-	cp '$(DIR)'/arch/$(KERNEL_ARCH)/boot/vmlinuz $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-	+$(MAKE_CLEAN) -C $(DIR) modules_install INSTALL_MOD_PATH='$(CURDIR)'/$(MODULES_PACKAGE_DIR)
-	cp $(DIR)/.config $(MODULES_PACKAGE_DIR)/boot/config-$(REAL_VERSION)
-	cp $(DIR)/System.map $(MODULES_PACKAGE_DIR)/boot/System.map-$(REAL_VERSION)
-	rm $(MODULES_PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/{build,source}
-	dh_installmodules -p$(MODULES_PACKAGE_NAME)
-	for i in $(XEN_VERSIONS); do echo $$i; done > $(PACKAGE_DIR)/var/lib/$(PACKAGE_NAME)/xen-versions
-	install -d $(PACKAGE_DIR)/DEBIAN
-	echo /var/lib/$(PACKAGE_NAME)/xen-versions >> $(PACKAGE_DIR)/DEBIAN/conffiles
-	+$(MAKE_SELF) install-base DH_OPTIONS='-p$(PACKAGE_NAME) -p$(MODULES_PACKAGE_NAME)'
-
 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)