From: Tim Yamin <plasmaroo@gentoo.org>
Date: Tue, 3 Jan 2006 22:54:34 +0000 (+0000)
Subject: Fix #115263, #117392, add a fix to sanify LOCALVERSION if unresolved variables are... 
X-Git-Tag: v3.4.10.902~405
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ded2cbe1aa7aed13df079db3ee3587560e0b9319;p=genkernel.git

Fix #115263, #117392, add a fix to sanify LOCALVERSION if unresolved variables are embedded.


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@347 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/gen_bootloader.sh b/gen_bootloader.sh
index b201506..878abff 100644
--- a/gen_bootloader.sh
+++ b/gen_bootloader.sh
@@ -19,7 +19,7 @@ set_grub_bootloader() {
 		GRUB_BOOTFS=${BOOTFS}
 	else	
 		# Extract block device information from /etc/fstab
-		GRUB_ROOTFS=$(awk '/[[:space:]]\/[[:space:]]/ { print $1 }' /etc/fstab)
+		GRUB_ROOTFS=$(awk '/^[^#].+[[:space:]]\/[[:space:]]/ { print $1 }' /etc/fstab)
 		GRUB_BOOTFS=$(awk '/^[^#].+[[:space:]]\/boot[[:space:]]/ { print $1 }' /etc/fstab)
 
 		# If /boot is not defined in /etc/fstab, it must be the same as /
diff --git a/gen_compile.sh b/gen_compile.sh
index 0043e14..a0a5e56 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -739,6 +739,9 @@ compile_klibc() {
 	elif [ "${ARCH}" = 'x86' ]
 	then
 		compile_generic "ARCH=i386" utils
+	elif [ "${KERNEL_CROSS_COMPILE}" != '' ]
+	then
+		compile_generic "CROSS=${KERNEL_CROSS_COMPILE}" utils
 	else
 		compile_generic "" utils
 	fi
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 10c4a02..5beff0d 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -31,7 +31,7 @@ get_KV() {
 		VER=`grep ^VERSION\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		PAT=`grep ^PATCHLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
 		SUB=`grep ^SUBLEVEL\ \= ${KERNEL_DIR}/Makefile | awk '{ print $3 };'`
-		EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
+		EXV=`grep ^EXTRAVERSION\ \= ${KERNEL_DIR}/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g" -e 's/\$([a-z]*)//gi'`
 		if [ "${PAT}" -gt '4' -a "${VER}" -ge '2' -a -e ${KERNEL_DIR}/.config ]
 		then
 			KERN_24=0
diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index e7e8c56..6804e6e 100644
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -627,7 +627,10 @@ create_initramfs() {
 
 	if ! isTrue "${CMD_NOINSTALL}"
 	then
-		cp ${TMPDIR}/initramfs-${KV} /boot/initramfs-${KNAME}-${ARCH}-${KV} ||
-			gen_die 'Could not copy the initramfs to /boot!'
+		if [ "${GENERATE_Z_IMAGE}" != '1' ]
+		then
+			cp ${TMPDIR}/initramfs-${KV} /boot/initramfs-${KNAME}-${ARCH}-${KV} ||
+				gen_die 'Could not copy the initramfs to /boot!'
+		fi
 	fi
 }
diff --git a/genkernel b/genkernel
index 7aa895b..618e94f 100755
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.3.10'
+GK_V='3.3.11'
 
 TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.