Added a patch from Joshua Kinard <kumba@gentoo.org> to clean up the Pegasos hacks...

[genkernel.git] / genkernel

diff --git a/genkernel b/genkernel
index 9ca1a7883cf1b20eb97a765bbf072cf43dc2b5e3..bcc8fc519bcb17a769b9afd3d7e1e1655ea899fc 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.9_pre3'
+GK_V='3.4.9_pre7'
 
 # Set the default for TMPDIR.  May be modified by genkernel.conf or the
 # --tempdir command line option.
@@ -27,9 +27,8 @@ parse_opt() {
 case "$*" in
        --config=*)
                CMD_GK_CONFIG=`parse_opt "$*"`
-               ;;
-       esac
-}
+       ;;
+esac
 
 source ${CMD_GK_CONFIG:-/etc/genkernel.conf} || small_die "Could not read /etc/genkernel.conf"
 
@@ -232,7 +231,7 @@ then
 
        # Compile kernel; If using --genzimage, or building a mips kernel, skip compile
        # till after initrd/initramfs is done
-       [ "${GENERATE_Z_IMAGE}" = '' -a ${BUILD_INITRAMFS} -eq 0 ] && compile_kernel
+       [ "${ENABLE_PEGASOS_HACKS}" != 'yes' -a ${BUILD_INITRAMFS} -eq 0 ] && compile_kernel
 
        # Compile modules
        if [ ${BUILD_MODULES} -eq 1 -a ${BUILD_STATIC} -eq 0 ]
@@ -248,7 +247,7 @@ then
        fi
        if [ "${KERNCACHE}" != "" ]
        then
-               if [ "${GENERATE_Z_IMAGE}" = '' -a ${BUILD_INITRAMFS} -eq 0 ]
+               if [ "${ENABLE_PEGASOS_HACKS}" != 'yes' -a ${BUILD_INITRAMFS} -eq 0 ]
                then
                        gen_kerncache
                fi
@@ -332,7 +331,7 @@ else
 fi
 
 # Pegasos fix
-if [ "${GENERATE_Z_IMAGE}" != '' -o ${BUILD_INITRAMFS} -eq 1 ]
+if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' -o ${BUILD_INITRAMFS} -eq 1 ]
 then
        # Compile kernel, intergrating the initrd into it for Pegasos & mips
        compile_kernel