From 3185bee3684c96f399a66f47dee5e40d03c79c8d Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Tue, 2 Aug 2005 15:38:10 +0000 Subject: [PATCH] Create symlink to init named linuxrc. In preparation for the need to pack the cpio into the kernel git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@299 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- gen_cmdline.sh | 2 -- gen_initramfs.sh | 3 +++ ppc/config.sh | 3 +++ ppc64/config.sh | 4 +++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gen_cmdline.sh b/gen_cmdline.sh index d328970..53f9229 100755 --- 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 35df9df..8dd79e5 100644 --- 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 3d36ee4..a105102 100644 --- 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 10b0a27..a8ab729 100644 --- 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 -- 2.26.2