livecd/genkernel_args for livecd-stage2

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@371 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 39987d9125e9457442cc2a8c8bc5d5dde22561bc..f9c2ee3d5b5c09f5d0b9bd52224b933e2374986b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.48 2004/05/17 01:21:17 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.49 2004/05/17 01:41:53 zhen Exp $
+
+  16 May 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript-support/kmerge.sh, modules/livecd_stage2_target.py:
+  added a feature to the livecd-stage2 specfile called "livecd/genkernel_args"
+  for passing args to genkernel. gmsoft@gentoo.org requested this one.
 
   16 May 2004; John Davis <zhen@gentoo.org> catalyst,
   modules/catalyst_support.py, modules/embedded_target.py,

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index 702fabe4ee6973fd72a5a45ffb8b8e90c67fb626..af4b42b09b4141d781fef4a2282a115dac412fd2 100755 (executable)
--- a/livecd/runscript-support/kmerge.sh
+++ b/livecd/runscript-support/kmerge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # 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.1 2004/05/12 21:18:50 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.2 2004/05/17 01:41:53 zhen Exp $
 
 die() {
        echo "$1"
@@ -47,7 +47,7 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
-genkernel ${genkernel_args} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
+genkernel ${clst_livecd_genkernel_args} --kerneldir=/usr/src/linux --kernel-config=/var/tmp/${clst_kname}.config --minkernpackage=/tmp/binaries/${clst_kname}.tar.bz2 all || exit 1
        
 #now we merge any kernel-dependent packages
 if [ -e /var/tmp/${clst_kname}.packages ]

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 595ea5681f4a4d61c962245f3f1e37f8fb0f64fc..8f89a3fdcd97f30689e4ec412cabc3cca9ceba7b 100644 (file)
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.1 2004/05/17 01:21:17 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.2 2004/05/17 01:41:53 zhen Exp $
 
 """
 Builder class for a LiveCD stage2 build.
@@ -28,7 +28,7 @@ class livecd_stage2_target(generic_stage_target):
                        self.valid_values.append("boot/kernel/"+x+"/packages")
                        self.valid_values.append("boot/kernel/"+x+"/use")
                self.valid_values.extend(self.required_values)
-               self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge","livecd/iso"])
+               self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge","livecd/iso","livecd/genkernel_args"])
                generic_stage_target.__init__(self,spec,addlargs)
                file_locate(self.settings, ["livecd/cdtar","livecd/archscript","livecd/runscript"])
        
@@ -59,7 +59,8 @@ class livecd_stage2_target(generic_stage_target):
                                self.settings["livecd/unmerge"]=[self.settings["livecd/unmerge"]]
                        myunmerge=self.settings["livecd/unmerge"][:]
                        for x in range(0,len(myunmerge)):
-                               #surround args with quotes for passing to bash, allows things like "<" to remain intact
+                               #surround args with quotes for passing to bash, 
+                               #allows things like "<" to remain intact
                                myunmerge[x]="'"+myunmerge[x]+"'"
                        myunmerge=string.join(myunmerge)
                        #before cleaning, unmerge stuff: