Commit fix for bug #141153 from Pylon; 3.4.0_pre4.

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 308028f12bd7aea0793787a8520cb191a8300b25..83511898911d928d03d1321c73e819373e0add31 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -468,7 +468,7 @@ parse_cmdline() {
              ;;
               --genzimage)
                        KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
-                       KERNEL_BINARY_2='arch/ppc/boot/images/zImage.initrd.chrp'
+                       KERNEL_BINARY_2='arch/powerpc/boot/zImage.initrd'
                        GENERATE_Z_IMAGE=1
                        print_info 2 "GENERATE_Z_IMAGE: $GENERATE_Z_IMAGE"
              ;;

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 18c17b0e8bb1e25869ca21c51efb08097f160eb9..3f1a3f73151d4e9e47281cbc3f0f2924d890c1a3 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -549,7 +549,7 @@ merge_initramfs_cpio_archives(){
        # Pegasos hack for merging the initramfs into the kernel at compile time
        [ "${KERNEL_MAKE_DIRECTIVE}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] ||
                [ "${KERNEL_MAKE_DIRECTIVE_2}" == 'zImage.initrd' -a "${GENERATE_Z_IMAGE}" = '1' ] &&
-                       cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/${ARCH}/boot/images/ramdisk.image.gz &&
+                       cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz &&
                        rm ${TMPDIR}/initramfs-${KV}
 
        # Mips also mimics Pegasos to merge the initramfs into the kernel

diff --git a/genkernel b/genkernel
index 0bb16fabeed16e792e81a26f4d80df597bcba00d..a754a08bf97f4486cc28fe88c12182d4f75bef89 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -2,7 +2,7 @@
 # Genkernel v3
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin"
-GK_V='3.4.0_pre2'
+GK_V='3.4.0_pre4'
 
 TMPDIR='/var/tmp/genkernel'
 TEMP=${TMPDIR}/$RANDOM.$RANDOM.$RANDOM.$$