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

[Bastian Blank]

Author: waldi
Date: Fri Apr 20 17:47:14 2012
New Revision: 18943

Log:
debian/rules.real: Remove weird arch checks.

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

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	Mon Apr 16 06:06:08 2012	(r18942)
+++ dists/trunk/linux-2.6/debian/rules.real	Fri Apr 20 17:47:14 2012	(r18943)
@@ -240,12 +240,10 @@
 	cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include $(DIR)/arch/$(KERNEL_ARCH)
 	cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s $(DIR)/arch/$(KERNEL_ARCH)/kernel
 
-ifneq ($(filter powerpc ppc64,$(ARCH)),)
 	if [ -f $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o ]; then \
 		mkdir $(DIR)/arch/$(KERNEL_ARCH)/lib; \
 		cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o $(DIR)/arch/$(KERNEL_ARCH)/lib; \
 	fi
-endif
 
 	@echo 'VERSION = 2' > $(DIR)/Makefile
 	@echo 'PATCHLEVEL = 6' >> $(DIR)/Makefile
@@ -379,20 +377,19 @@
 install-image_mipsel_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 
-ifneq ($(filter powerpc ppc64,$(ARCH)),)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image:
+install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
+install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_image: WRAPPER_INSTALL_DIR = '$(CURDIR)'/$(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
+install-image_powerpc_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_ppc64_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 	+$(MAKE_CLEAN) -C '$(DIR)' bootwrapper_install \
 	  WRAPPER_OBJDIR='$(WRAPPER_INSTALL_DIR)' \
 	  WRAPPER_DTSDIR='$(WRAPPER_INSTALL_DIR)'/dts \
 	  WRAPPER_BINDIR='$(WRAPPER_INSTALL_DIR)'
-endif
 
-ifneq ($(filter s390 s390x,$(ARCH)),)
-install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_image:
+install-image_s390_$(FEATURESET)_$(FLAVOUR)_plain_image \
+install-image_s390x_$(FEATURESET)_$(FLAVOUR)_plain_image:
 	install -m644 '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
-endif
 
 ifneq ($(INITRAMFS),False)
 install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: ARG_INITRD = YES