[PATCH] use vmlinux during make install on ppc64

[Olaf Hering]

 On Thu, Feb 10, Sam Ravnborg wrote:

> Please take a look at the funcionality offered by KBUILD_IMAGE
> KBUILD_IMAGE is supposed to be used for this purpose.
> 
> Otherwise your patch looks good.

Is that one ok for akpm?
There is also a typo:

diff -purNx tags ../linux-2.6.11-rc4.orig/Makefile ./Makefile
--- ../linux-2.6.11-rc4.orig/Makefile	2005-02-13 04:06:56.000000000 +0100
+++ ./Makefile	2005-02-13 11:13:18.889376754 +0100
@@ -539,7 +539,7 @@ CFLAGS += $(call cc-option,-Wno-pointer-
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the commandline or
 # set in the environment
-# Also any assingments in arch/$(ARCH)/Makefiel take precedence over
+# Also any assingments in arch/$(ARCH)/Makefile take precedence over
 # this default value
 export KBUILD_IMAGE ?= vmlinux
 
diff -purNx tags ../linux-2.6.11-rc4.orig/arch/ppc64/Makefile ./arch/ppc64/Makefile
--- ../linux-2.6.11-rc4.orig/arch/ppc64/Makefile	2005-02-13 04:05:28.000000000 +0100
+++ ./arch/ppc64/Makefile	2005-02-13 11:13:45.991280990 +0100
@@ -65,14 +65,20 @@ boottarget-$(CONFIG_PPC_ISERIES) := vmli
 $(boottarget-y): vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-bootimage-$(CONFIG_PPC_PSERIES) := zImage
-bootimage-$(CONFIG_PPC_MAPLE) := zImage
+bootimage-$(CONFIG_PPC_PSERIES) := $(boot)/zImage
+bootimage-$(CONFIG_PPC_PMAC) := vmlinux
+bootimage-$(CONFIG_PPC_MAPLE) := $(boot)/zImage
 bootimage-$(CONFIG_PPC_ISERIES) := vmlinux
 BOOTIMAGE := $(bootimage-y)
 install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@
 
-all: $(BOOTIMAGE)
+defaultimage-$(CONFIG_PPC_PSERIES) := zImage
+defaultimage-$(CONFIG_PPC_PMAC) := vmlinux
+defaultimage-$(CONFIG_PPC_MAPLE) := zImage
+defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
+KBUILD_IMAGE := $(defaultimage-y)
+all: $(KBUILD_IMAGE)
 
 archclean:
 	$(Q)$(MAKE) $(clean)=$(boot)
diff -purNx tags ../linux-2.6.11-rc4.orig/arch/ppc64/boot/Makefile ./arch/ppc64/boot/Makefile
--- ../linux-2.6.11-rc4.orig/arch/ppc64/boot/Makefile	2005-02-13 04:07:34.000000000 +0100
+++ ./arch/ppc64/boot/Makefile	2005-02-13 10:42:48.782252046 +0100
@@ -117,7 +117,7 @@ $(obj)/imagesize.c: vmlinux.strip
 	awk '{printf "unsigned long vmlinux_memsize = 0x%s;\n", substr($$1,8)}' \
 		>> $(obj)/imagesize.c
 
-install: $(CONFIGURE) $(obj)/$(BOOTIMAGE)
-	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" "$(obj)/$(BOOTIMAGE)" "$(INSTALL_PATH)"
+install: $(CONFIGURE) $(BOOTIMAGE)
+	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"
 
 clean-files := $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)
diff -purNx tags ../linux-2.6.11-rc4.orig/arch/ppc64/boot/install.sh ./arch/ppc64/boot/install.sh
--- ../linux-2.6.11-rc4.orig/arch/ppc64/boot/install.sh	2005-02-13 04:08:05.000000000 +0100
+++ ./arch/ppc64/boot/install.sh	2005-02-13 10:42:48.783251890 +0100
@@ -17,6 +17,7 @@
 #   $2 - kernel image file
 #   $3 - kernel map file
 #   $4 - default install path (blank if root directory)
+#   $5 - kernel boot file, the zImage
 #
 
 # User may have a custom install script
@@ -27,7 +28,7 @@ if [ -x /sbin/installkernel ]; then exec
 # Default install
 
 # this should work for both the pSeries zImage and the iSeries vmlinux.sm
-image_name=`basename $2`
+image_name=`basename $5`
 
 if [ -f $4/$image_name ]; then
 	mv $4/$image_name $4/$image_name.old