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

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 b201506d35a61f16420fc73d2d8e234f312f62ae..878abff7ab841f99583cc3e18ed399a64424214f 100644 (file)
--- 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 0043e148232e634d84c25d979b0fe51a36ece625..a0a5e567863d6ed1d93fc90be3b7db3c53e28dd7 100644 (file)
--- 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 10c4a02daec5151051cdb942f56b8fe1c567335c..5beff0db5e6deec24c6e2ed2024e486488108c21 100644 (file)
--- 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 e7e8c56547facd37dd26bb0b86559550fc6aa0ac..6804e6e95d71c787d38091984b36c5b36a30541b 100644 (file)
--- 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 7aa895badf895cba67992c6989f173dfd6b9bf86..618e94f0930b678d9f7832a255302ec4d6718bf6 100755 (executable)
--- 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.