From 4304d907baf2e2201d8ef9fcf447988ce5161fae Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Fri, 14 Mar 2008 02:21:43 +0000 Subject: [PATCH] Switch back to building kernel first Optionally build the kernel a second time if we're integrating the initramfs git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@653 67a159dc-881f-0410-a524-ba9dfbe2cb84 --- ChangeLog | 4 ++++ genkernel | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f964b21..e31ab50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ # Copyright 2006-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Mar 2008; Andrew Gaffney genkernel: + Switch back to building kernel first + Optionally build the kernel a second time if we're integrating the initramfs + 14 Mar 2008; Chris Gianelloni alpha/modules_load, genkernel, ia64/modules_load, mips/modules_load, parisc/modules_load, parisc64/modules_load, ppc/modules_load, ppc64/modules_load, diff --git a/genkernel b/genkernel index 1c1119c..c9e651d 100755 --- a/genkernel +++ b/genkernel @@ -232,6 +232,8 @@ then # KV may have changed due to the configuration get_KV + compile_kernel + # Compile modules if [ ${BUILD_MODULES} -eq '1' -a ${BUILD_STATIC} -eq '0' ] then @@ -316,15 +318,13 @@ else print_info 1 'initrd: Not building since only the kernel was requested...' fi -if isTrue "${INTEGRATED_INITRAMFS}" || [ ${BUILD_KERNEL} -eq '1' -a "${KERNCACHE_IS_VALID}" == "0" ] +if isTrue "${INTEGRATED_INITRAMFS}" #|| [ ${BUILD_KERNEL} -eq '1' -a "${KERNCACHE_IS_VALID}" == "0" ] then + # We build the kernel a second time to include the initramfs compile_kernel - - # We skipped the kernel build and kerncache generation - # So do it here - [ "${KERNCACHE}" != "" ] && gen_kerncache fi +[ "${KERNCACHE}" != "" ] && gen_kerncache [ "${MINKERNPACKAGE}" != '' ] && gen_minkernpackage [ "${MODULESPACKAGE}" != '' ] && gen_modulespackage -- 2.26.2