Create symlink to init named linuxrc. In preparation for the need to pack the cpio...

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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d328970130868a3ffab4f293462a2ebae78b5a13..53f92298a6c88a1b1e9c46dfd7cd4a0071beaf23 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -423,8 +423,6 @@ 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/gen_initramfs.sh b/gen_initramfs.sh
index 35df9df40fbcf142a85f006df35e6931e179c638..8dd79e5abc02d0471b9e96d8db4f1721a542538b 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -371,6 +371,9 @@ create_initramfs_aux() {
                fi
        fi
 
+       # Make a symlink to init .. incase we are bundled inside the kernel as one big cpio.    
+       ln -s ${TEMP}/initramfs-aux-temp/init ${TEMP}/initramfs-aux-temp/linuxrc 
+
        if [ -f "${GK_SHARE}/${ARCH}/initrd.scripts" ]
        then
                cp "${GK_SHARE}/${ARCH}/initrd.scripts" "${TEMP}/initramfs-aux-temp/etc/initrd.scripts"

diff --git a/ppc/config.sh b/ppc/config.sh
index 3d36ee439115f5f540293e9e897aa34da77dcbee..a105102a6a0a103bd33222976cfed533c16fd741 100644 (file)
--- a/ppc/config.sh
+++ b/ppc/config.sh
@@ -4,6 +4,9 @@
 KERNEL_MAKE_DIRECTIVE="vmlinux"
 KERNEL_BINARY="vmlinux"
 
+KERNEL_MAKE_DIRECTIVE_2='zImage.initrd'
+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
 USE_DIETLIBC=1

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