From: Chris Gianelloni Date: Tue, 11 Jan 2005 22:49:44 +0000 (+0000) Subject: Added ccache support to genkernel call in livecd-stage2. X-Git-Tag: CATALYST_2_0_6_916~856 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5abf4d2adc59220ae1b552deaff286b24412b93d;p=catalyst.git Added ccache support to genkernel call in livecd-stage2. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@517 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 6a5ee64b..eddd3ad3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.144 2005/01/11 15:22:41 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.145 2005/01/11 22:49:44 wolf31o2 Exp $ + + 11 Jan 2005; Chris Gianelloni + livecd/runscript-support/kmerge.sh: + Added ccache support to genkernel call in livecd-stage2. 11 Jan 2005; John Davis targets/netboot/netboot-busybox.sh, targets/netboot/netboot-combine.sh, diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh index faaf86f3..ca6b26ea 100755 --- a/livecd/runscript-support/kmerge.sh +++ b/livecd/runscript-support/kmerge.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.19 2004/10/28 15:05:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.20 2005/01/11 22:49:44 wolf31o2 Exp $ die() { echo "$1" @@ -12,6 +12,7 @@ build_kernel() { # default genkernel args GK_ARGS="${clst_livecd_gk_mainargs} \ ${clst_livecd_gk_kernargs} \ + --no-mountboot \ --kerneldir=/usr/src/linux \ --kernel-config=/var/tmp/${clst_kname}.config \ --minkernpackage=/usr/portage/packages/gk_binaries/${clst_kname}-${clst_version_stamp}.tar.bz2 all" @@ -26,6 +27,11 @@ build_kernel() { then GK_ARGS="${GK_ARGS} --gensplash=${clst_livecd_splash_theme}" fi + + if [ -n "${clst_CCACHE}" ] + then + GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc" + fi if [ -e "/var/tmp/${clst_kname}.postconf" ] then