From fe2817e3ca3867318707dd4d257fbf7d164e2c7b Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 19 Jun 2007 04:24:41 +0000
Subject: [PATCH] Clifford Wolf: 	Some cleanups and improvements in the
 linux kernel install code

[2007061610575410198] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8584 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/linux/linux.conf | 75 +++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 090b115ed..499c547f4 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -375,48 +375,50 @@ main_lx() {
 	eval $MAKE -j 1 clean > /dev/null
 
 	echo "Building the kernel ..."
-	[ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ] && default=1
 	case "$lx_cpu" in
-	    i386)
+	    i386|x86_64)
 		eval $MAKE bzImage
 		cp -vf arch/i386/boot/bzImage $root/boot/vmlinuz_${lx_kernelrelease}
-		[ "$default" ] && \
-		  cp -vf arch/i386/boot/bzImage $root/boot/vmlinuz
-		;;
-	    x86_64)
-		eval $MAKE bzImage
-		cp -vf arch/x86_64/boot/bzImage $root/boot/vmlinuz_${lx_kernelrelease}
-		[ "$default" ] && \
-		  cp -vf arch/x86_64/boot/bzImage $root/boot/vmlinuz
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinuz_${lx_kernelrelease} $root/boot/vmlinuz
+		fi
 		;;
 	    alpha)
 		eval $MAKE vmlinux
 		gzip < vmlinux > $root/boot/vmlinux_${lx_kernelrelease}.gz
-		[ "$default" ] && \
-		  cp -vf $root/boot/vmlinux_$ver-rock.gz $root/boot/vmlinux.gz
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinuz_${lx_kernelrelease}.gz $root/boot/vmlinuz.gz
+		fi
 		;;
 	    arm)
 		eval $MAKE zImage
 		cp -vf arch/arm/boot/zImage $root/boot/zImage_${lx_kernelrelease}
-		[ "$default" ] && \
-		  cp -vf arch/arm/boot/zImage $root/boot/zImage
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf zImage_${lx_kernelrelease} $root/boot/zImage
+		fi
 		;;
 	    mips)
 		eval $MAKE vmlinux
 		$BUILDCC arch/mips/boot/elf2ecoff.c -o elf2ecoff
 		./elf2ecoff vmlinux vmlinux.ecoff
 		cp -vf vmlinux.ecoff $root/boot/vmlinux_${lx_kernelrelease}.ecoff
-		[ "$default" ] && \
-		  cp -vf vmlinux.ecoff $root/boot/
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinux_${lx_kernelrelease}.ecoff $root/boot/vmlinux.ecoff
+		fi
 		;;
 	    ppc)
 		eval $MAKE vmlinux
 		cp -vf vmlinux $root/boot/vmlinux_${lx_kernelrelease}
-		[ "$default" ] && \
-		  cp -vf vmlinux $root/boot/vmlinux
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinux_${lx_kernelrelease} $root/boot/vmlinux
+		fi
 		eval $MAKE zImage
 		for x in arch/ppc/boot/images/zImage.* ; do
-		  cp -v $x $root/boot/${x/arch\/ppc\/boot\/images\//}-$ver
+			y=$( echo $x | sed 's,.*/zImage\.,,'; )
+			cp -v $x $root/boot/zImage_${lx_kernelrelease}.$y
+			if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+				ln -svf zImage_${lx_kernelrelease}.$y $root/boot/zImage.$y
+			fi
 		done
 		;;
 	    sparc)
@@ -425,34 +427,38 @@ main_lx() {
 		else
 			eval $MAKE image
 		fi
-
-		cp -vf vmlinux $root/boot/vmlinux32_${lx_kernelrelease}
-		[ "$default" ] && \
-				gzip -9 < vmlinux > $root/boot/vmlinux32.gz
+		gzip -9 < vmlinux > $root/boot/vmlinux32_${lx_kernelrelease}.gz
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinux32_${lx_kernelrelease}.gz $root/boot/vmlinux32.gz
+		fi
 		;;
 	    sparc64)
 		eval $MAKE vmlinux
-		cp -vf vmlinux $root/boot/vmlinux64_${lx_kernelrelease}
-		[ "$default" ] && \
-			gzip -9 < vmlinux > $root/boot/vmlinux64.gz
+		gzip -9 < vmlinux > $root/boot/vmlinux64_${lx_kernelrelease}.gz
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinux64_${lx_kernelrelease}.gz $root/boot/vmlinux64.gz
+		fi
 		;;
 	    um)
 		eval $MAKE linux
 		cp -vf linux $root/boot/linux_${lx_kernelrelease}
-		[ "$default" ] && \
-		  cp -vf linux $root/boot/linux
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf linux_${lx_kernelrelease} $root/boot/linux
+		fi
 		;;
 	    *)
 		eval $MAKE vmlinux
 		cp -vf vmlinux $root/boot/vmlinux_${lx_kernelrelease}
-		[ "$default" ] && \
-		  cp -vf vmlinux $root/boot/vmlinux
+		if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+			ln -svf vmlinux_${lx_kernelrelease} $root/boot/vmlinux
+		fi
 		;;
 	esac
 	cp -vf .config $root/boot/kconfig_${lx_kernelrelease}
 	cp -vf System.map $root/boot/System.map-${lx_kernelrelease}
-	[ "$default" ] && cp -vf System.map $root/boot/System.map
-
+	if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+		ln -svf System.map-${lx_kernelrelease} $root/boot/System.map
+	fi
 
 	# only build modules if enabled in the kernel config,
 	# otherwise a build error will occur
@@ -485,9 +491,8 @@ main_lx() {
 
 	# just create a symlink to the default initrd image here; the file
 	# pointed to will be created by the rockinitrd postinstall script
-	if [ "$default" ] ; then
-		rm -f /boot/initrd.img
-		ln -s initrd-${lx_kernelrelease}.img /boot/initrd.img
+	if [ "$xpkg" = "$ROCKCFG_PKG_LINUX_DEFAULT" ]; then
+		ln -svf initrd-${lx_kernelrelease}.img /boot/initrd.img
 	fi
 }