From: Chris Gianelloni Date: Wed, 5 Mar 2008 21:44:28 +0000 (+0000) Subject: Make sure we don't give genkernel a --kernel-config if it isn't set in the spec. X-Git-Tag: CATALYST_2_0_6_916~132 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=653002424f1b35c3d9dc2add3fb1f009b0a416e7;p=catalyst.git Make sure we don't give genkernel a --kernel-config if it isn't set in the spec. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1362 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 46882956..c5d73a91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 05 Mar 2008; Chris Gianelloni + targets/support/kmerge.sh: + Make sure we don't give genkernel a --kernel-config if it isn't set in the + spec. + 05 Mar 2008; Chris Gianelloni catalyst, modules/generic_stage_target.py, targets/support/kmerge.sh, targets/support/pre-kmerge.sh: diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index d844d7e3..67a41a02 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -14,7 +14,6 @@ setup_gk_args() { --cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} \ --no-mountboot \ --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 all" # extra genkernel options that we have to test for @@ -22,6 +21,10 @@ setup_gk_args() { then GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2" fi + if [ -e /var/tmp/${clst_kname}.config ] + then + GK_ARGS="${GK_ARGS} --kernel-config=/var/tmp/${clst_kname}.config" + fi if [ -n "${clst_splash_theme}" ] then