diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2008-03-13 01:33:15 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2008-03-13 01:33:15 +0000 |
| commit | d176b8c10411c9da2ed8e130da8f6a5401ab1ca9 (patch) | |
| tree | 52574d96bfe278f1f4d76b7ed877cf755530c414 /gen_initramfs.sh | |
| parent | Argh...Changing the right line helps (diff) | |
| download | genkernel-d176b8c10411c9da2ed8e130da8f6a5401ab1ca9.tar.gz genkernel-d176b8c10411c9da2ed8e130da8f6a5401ab1ca9.tar.bz2 genkernel-d176b8c10411c9da2ed8e130da8f6a5401ab1ca9.zip | |
Get rid of the ENABLE_PEGASOS_HACKS hacks
Add INTEGRATED_INITRAMFS option to optionally insert the generated initramfs directly into the kernel image
Change default build order to build the kernel last to facilitate the INTEGRATED_INITRAMFS option
Add GENZIMAGE option and change various checks from ENABLE_PEGASOS_HACKS to GENZIMAGE
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@631 67a159dc-881f-0410-a524-ba9dfbe2cb84
Diffstat (limited to 'gen_initramfs.sh')
| -rw-r--r-- | gen_initramfs.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gen_initramfs.sh b/gen_initramfs.sh index af066421..69f20f58 100644 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -492,21 +492,15 @@ create_initramfs() { gzip -9 "${CPIO}" mv -f "${CPIO}.gz" "${CPIO}" - if [ "${ENABLE_PEGASOS_HACKS}" = 'yes' ] + if isTrue "${INTEGRATED_INITRAMFS}" then - # Pegasos hack for merging the initramfs into the kernel at compile time - cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/arch/powerpc/boot/ramdisk.image.gz && - rm ${TMPDIR}/initramfs-${KV} - elif [ ${BUILD_INITRAMFS} -eq '1' ] - then - # Mips also mimics Pegasos to merge the initramfs into the kernel cp ${TMPDIR}/initramfs-${KV} ${KERNEL_DIR}/initramfs.cpio.gz gunzip -f ${KERNEL_DIR}/initramfs.cpio.gz fi if ! isTrue "${CMD_NOINSTALL}" then - if [ "${ENABLE_PEGASOS_HACKS}" != 'yes' ] + if ! isTrue "${INTEGRATED_INITRAMFS}" then copy_image_with_preserve "initramfs" \ "${TMPDIR}/initramfs-${KV}" \ |