[kernel] r8293 - dists/trunk/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: Fri Feb  9 16:52:21 2007
New Revision: 8293

Modified:
   dists/trunk/linux-2.6/debian/rules.real
Log:
debian/rules.real: Resort.


Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Feb  9 16:52:21 2007
@@ -393,18 +393,14 @@
 install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image:
 	cp '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
-install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
-	dh_testdir
-	dh_testroot
-	dh_clean -d -k
-	dh_installdirs 'boot'
-	cp '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
-	$(MAKE) -f debian/rules.real install-base
-
 ifneq ($(INITRAMFS),False)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_INITRD = YES
 endif
 
+install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_KIMAGE = vmlinux
+
+install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_BOOTLOADER = zipl
+
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain_templates:
 	install -d $(PACKAGE_DIR)/DEBIAN
 	for i in $(notdir $(wildcard debian/templates/temp.image.plain/*)); do \
@@ -429,9 +425,13 @@
 	chmod 755 '$(PACKAGE_DIR)'/DEBIAN/{config,{pre,post}*}
 	chmod 644 '$(PACKAGE_DIR)'/DEBIAN/templates
 
-install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_KIMAGE = vmlinux
-
-install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_templates: ARG_BOOTLOADER = zipl
+install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-s390-tape:
+	dh_testdir
+	dh_testroot
+	dh_clean -d -k
+	dh_installdirs 'boot'
+	cp '$(DIR)/arch/s390/boot/image' $(PACKAGE_DIR)/boot/vmlinuz-$(REAL_VERSION)
+	$(MAKE) -f debian/rules.real install-base
 
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)