Fix cosmetics and PPC without --genzimage.

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 53f92298a6c88a1b1e9c46dfd7cd4a0071beaf23..d328970130868a3ffab4f293462a2ebae78b5a13 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -423,6 +423,8 @@ parse_cmdline() {
                        print_info 2 "CMD_LINUXRC: $CMD_LINUXRC"
              ;;
               --genzimage)
+                       KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
+                       KERNEL_BINARY_2='arch/ppc/boot/images/zImage.initrd.chrp'
                        GENERATE_Z_IMAGE=1
                        print_info 2 "GENERATE_Z_IMAGE: $GENERATE_Z_IMAGE"
              ;;

diff --git a/generic/initrd.scripts b/generic/initrd.scripts
index ab74e829df63053db60519497ce40d2a79c876f3..252f05ad23c39913d86d76e6cae06ed50fa0b394 100644 (file)
--- a/generic/initrd.scripts
+++ b/generic/initrd.scripts
@@ -265,11 +265,11 @@ start_dev_mgr(){
     if [ "${USE_UDEV_NORMAL}" -eq '1' ]
     then
                cd /sys
-               [ "${DO_bladecenter}" -eq '1' ] && sleep 10
+               [ "${DO_bladecenter}" ] && sleep 10
                kill_devfsd
                good_msg 'Activating udev'
                runUdev
-               [ "${DO_bladecenter}" -eq '1' ] && sleep 20
+               [ "${DO_bladecenter}" ] && sleep 20
                cd /
     else
                if [ ! -e /dev/.devfsd ]

diff --git a/generic/linuxrc b/generic/linuxrc
index 58e2e0eb4e137e6fbda725a08a62c257f82138b3..cb0f94bfb417ca642a81c0ba59e83fdd3685b292 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -539,7 +539,7 @@ then
                        fi
                done
 
-               [ "${DO_bladecenter}" -eq '1' ] && sleep 10
+               [ "${DO_bladecenter}" ] && sleep 10
                mkdir initrd proc tmp sys 2>/dev/null
                chmod 1777 tmp
        fi
@@ -554,7 +554,7 @@ then
        # Let Init scripts know that we booted from CD
        export CDBOOT
        CDBOOT=1
-       [ "${DO_bladecenter}" -eq '1' ] && sleep 10
+       [ "${DO_bladecenter}" ] && sleep 10
 else
        mkdir -p ${NEW_ROOT}/tmp/.initrd
 fi
@@ -578,7 +578,7 @@ then
        cd ${CHROOT}
        mkdir ${CHROOT}/proc ${CHROOT}/sys 2>/dev/null
        pivot_root . tmp/.initrd
-       [ "${DO_bladecenter}" -eq '1' ] && sleep 10
+       [ "${DO_bladecenter}" ] && sleep 10
        echo -n '.'
 
        if /tmp/.initrd/bin/[ "${USE_DEVFS_NORMAL}" -eq '1' -a "${CDROOT}" -eq '0' ]

diff --git a/genkernel b/genkernel
index 9c720e9fd073f17fd28af2e3d35feb32031cf571..6eda2bbe7b0f5fd014541b59c5af4a0db46ba0e1 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.3.4'
+GK_V='3.3.5'
 
 TMPDIR='/var/tmp/genkernel'
 TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.

diff --git a/ppc/config.sh b/ppc/config.sh
index a1776855556512002e1de142f7b608e70ca9f70b..3d36ee439115f5f540293e9e897aa34da77dcbee 100644 (file)
--- a/ppc/config.sh
+++ b/ppc/config.sh
@@ -2,9 +2,7 @@
 # ppc/config.sh
 
 KERNEL_MAKE_DIRECTIVE="vmlinux"
-KERNEL_MAKE_DIRECTIVE_2="zImage.initrd"
 KERNEL_BINARY="vmlinux"
-KERNEL_BINARY_2="arch/ppc/boot/images/zImage.initrd.chrp"
 
 # The dietlibc portion of busybox is commented out right now
 # other stuff seems to compile fine though