diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-12 21:34:20 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-12 21:34:20 +0000 |
| commit | 7f0725d2616e0188a2cfba607d676affeccce228 (patch) | |
| tree | 1a3f9a6c952db5a7f37f7cd89e7ae2159d859168 | |
| parent | Updated cdtar for x86 to 3.09 version, as 2.13 was ancient. (diff) | |
| download | gentoo-7f0725d2616e0188a2cfba607d676affeccce228.tar.gz gentoo-7f0725d2616e0188a2cfba607d676affeccce228.tar.bz2 gentoo-7f0725d2616e0188a2cfba607d676affeccce228.zip | |
Removed postconf stuff from kmerge.sh, since it is gone from genkernel. This is catalyst 1.1.10.3.
| -rw-r--r-- | src/catalyst/ChangeLog | 7 | ||||
| -rw-r--r-- | src/catalyst/catalyst | 4 | ||||
| -rw-r--r-- | src/catalyst/livecd/runscript-support/kmerge.sh | 24 |
3 files changed, 11 insertions, 24 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 2325cf625c..8d69eb34b3 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.98 2005/07/12 21:02:36 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.99 2005/07/12 21:34:20 wolf31o2 Exp $ + + 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, + livecd/runscript-support/kmerge.sh: + Removed postconf stuff from kmerge.sh, since it is gone from genkernel. This + is catalyst 1.1.10.3. 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> -livecd/cdtar/isolinux-2.13-cdtar.tar.bz2, diff --git a/src/catalyst/catalyst b/src/catalyst/catalyst index 88be5a461f..63b23c0f89 100644 --- a/src/catalyst/catalyst +++ b/src/catalyst/catalyst @@ -1,12 +1,12 @@ #!/usr/bin/python # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.24 2005/07/12 15:21:29 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.25 2005/07/12 21:34:20 wolf31o2 Exp $ import os,sys,imp,string,getopt __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>" -__version__="1.1.10.2" +__version__="1.1.10.3" conf_values={} diff --git a/src/catalyst/livecd/runscript-support/kmerge.sh b/src/catalyst/livecd/runscript-support/kmerge.sh index c7d25ed4a2..ae6f8fe0c9 100644 --- a/src/catalyst/livecd/runscript-support/kmerge.sh +++ b/src/catalyst/livecd/runscript-support/kmerge.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 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.25.2.5 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.25.2.6 2005/07/12 21:34:20 wolf31o2 Exp $ die() { echo "$1" @@ -33,14 +33,6 @@ build_kernel() { 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 - for x in $( cat /var/tmp/${clst_kname}.postconf ) - do - clst_kernel_postconf="${clst_kernel_postconf} ${x}" - done - fi - if [ -e "/var/tmp/${clst_kname}.packages" ] then for x in $( cat /var/tmp/${clst_kname}.packages ) @@ -63,21 +55,11 @@ build_kernel() { fi # build with genkernel using the set options - # callback and postconf are put here to avoid escaping issues - if [ -e "/var/tmp/${clst_kname}.packages" -a \ - -e "/var/tmp/${clst_kname}.postconf" ] - then - genkernel --callback="emerge ${clst_kernel_merge}" \ - --postconf="emerge ${clst_kernel_postconf}" \ - ${GK_ARGS} || exit 1 - elif [ -e "/var/tmp/${clst_kname}.packages" ] + # callback is put here to avoid escaping issues + if [ -e "/var/tmp/${clst_kname}.packages" ] then genkernel --callback="emerge ${clst_kernel_merge}" \ ${GK_ARGS} || exit 1 - elif [ -e "/var/tmp/${clst_kname}.postconf" ] - then - genkernel --postconf="emerge ${clst_kernel_postconf}" \ - ${GK_ARGS} || exit 1 else genkernel ${GK_ARGS} || exit 1 fi |