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

[Bastian Blank]

Author: waldi
Date: Sun Jan 28 14:18:50 2007
New Revision: 8244

Modified:
   dists/trunk/linux-2.6/debian/rules.real
Log:
debian/rules.real
- Install vmlinux not executable.
- Set correct kimage value for powerpc.


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	Sun Jan 28 14:18:50 2007
@@ -390,7 +390,7 @@
 	cp '$(DIR)/arch/i386/boot/bzImage' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
 
 install-image-powerpc-$(SUBARCH)-$(FLAVOUR)-plain_image:
-	cp '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
+	install -m644 '$(DIR)/vmlinux' $(INSTALL_DIR)/vmlinux-$(REAL_VERSION)
 
 install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_image:
 	cp '$(DIR)/arch/s390/boot/image' $(INSTALL_DIR)/vmlinuz-$(REAL_VERSION)
@@ -417,11 +417,11 @@
 	    -e 's@=A@$(DEB_HOST_ARCH)@g' \
 	    -e 's@=B@$(KERNEL_ARCH)@g' \
 	    -e 's/=I/$(ARG_INITRD)/g' \
-	    -e 's/=L/$(BOOTLOADER)/g' \
+	    -e 's/=K/$(ARG_KIMAGE)/g' \
+	    -e 's/=L/$(ARG_BOOTLOADER)/g' \
 	    -e 's@=MK@$(INITRD_CMD)@g' \
 	    -e 's/=V/$(REAL_VERSION)/g' \
 	    -e 's/=IB//g' \
-	    -e 's/=K//g' \
 	    -e 's/=M//g' \
 	    -e 's/=MD//g' \
 	    -e 's/=R//g' \
@@ -431,7 +431,9 @@
 	chmod 755 '$(PACKAGE_DIR)'/DEBIAN/{config,{pre,post}*}
 	chmod 644 '$(PACKAGE_DIR)'/DEBIAN/templates
 
-install-image-s390-$(SUBARCH)-$(FLAVOUR)-plain_templates: BOOTLOADER = zipl
+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-xen: MODULES_PACKAGE_NAME = linux-modules-$(REAL_VERSION)
 install-image-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-plain-xen: MODULES_PACKAGE_DIR = $(CURDIR)/debian/$(MODULES_PACKAGE_NAME)