Instead of copying the initramfs into the kernel tree, we now sed the kconfig to...

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

diff --git a/ChangeLog b/ChangeLog
index 90db5e4c2334f1fb70ab71cb42ff35f655a11f18..78f97dc666579542373adc5d7b36a4734ca7bddf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> gen_initramfs.sh,
+  genkernel:
+  Instead of copying the initramfs into the kernel tree, we now sed the
+  kconfig to point CONFIG_INITRAMFS_SOURCE to the generated image
+
   13 Mar 2008; Andrew Gaffney <agaffney@gentoo.org> sparc64/modules_load:
   Add scsi_wait_scan to sparc64's MODULES_SCSI
 

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 3fe7fa0ca1d326057e05148c811b440ad3b70a09..2d77d19b3d6516d77939e00058eec39682372d31 100644 (file)
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -494,7 +494,9 @@ create_initramfs() {
 
        if isTrue "${INTEGRATED_INITRAMFS}"
        then
-               cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/usr/initramfs_data.cpio.gz
+#              cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/usr/initramfs_data.cpio.gz
+               mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio.gz
+               sed -i "s/^.*CONFIG_INITRAMFS_SOURCE=.*$/CONFIG_INITRAMFS_SOURCE=\"${TMPDIR}/initramfs-${KV}.cpio.gz\"/" ${KERNEL_CONFIG}
        fi
 
        if ! isTrue "${CMD_NOINSTALL}"

diff --git a/genkernel b/genkernel
index 30608b53fb25c88e16f5a48961e79a670da8a5a5..328011ac6bef38dc83378d0772bbc6f4efde39bb 100755 (executable)
--- a/genkernel
+++ b/genkernel
@@ -124,7 +124,6 @@ set_kernel_arch
 
 setup_cache_dir
 
-
 dump_debugcache
 
 NORMAL=${BOLD} print_info 1 "Linux Kernel ${BOLD}${KV}${NORMAL} for ${BOLD}${ARCH}${NORMAL}..."