Make the --kerncache option to genkernel dependent on 'kerncache' being in options...

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 351fa853a21237cb9eafc423e928b44879d646cf..09ee78592edb664f6729735294a7c40a89dc6bbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  07 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
+  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 <wolf31o2@gentoo.org> 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 d2408d65b179ad1147abb37acd1c78a26eaaedbb..254fe7a341721faa3546123e56acf547ede836ff 100755 (executable)
--- 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}"