From: Andrew Gaffney Date: Thu, 7 Feb 2008 17:04:23 +0000 (+0000) Subject: Make the --kerncache option to genkernel dependent on 'kerncache' being in options... X-Git-Tag: CATALYST_2_0_6_916~208 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6266bc2ed506c3303a2156cd9927a0dcbf6afb49;p=catalyst.git Make the --kerncache option to genkernel dependent on 'kerncache' being in options, so that it can actually be turned off git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1286 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 351fa853..09ee7859 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 07 Feb 2008; Andrew Gaffney + targets/support/kmerge.sh: + Make the --kerncache option to genkernel dependent on 'kerncache' being in + options, so that it can actually be turned off + 07 Feb 2008; Chris Gianelloni arch/amd64.py, arch/mips.py: Rearrange things in the arch/*.py files to ensure that nothing is used diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index d2408d65..254fe7a3 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -17,9 +17,13 @@ setup_gk_args() { --kerneldir=/usr/src/linux \ --kernel-config=/var/tmp/${clst_kname}.config \ --modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 \ - --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 \ - --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2 all" + --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all" # extra genkernel options that we have to test for + if [ -n "${clst_KERNCACHE}" ] + then + GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2" + fi + if [ "${clst_splash_type}" == "bootsplash" -a -n "${clst_splash_theme}" ] then GK_ARGS="${GK_ARGS} --bootsplash=${clst_splash_theme}"