From: Daniel Robbins Date: Tue, 20 Jan 2004 23:56:43 +0000 (+0000) Subject: livecd polish X-Git-Tag: CATALYST_1_0_1~53 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c305bc86945bfe2575d1cbb57b41fe7cee2fdc54;p=catalyst.git livecd polish git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@187 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/examples/livecd/x86/x86-livecd-stage2-20040114.spec b/examples/livecd/x86/x86-livecd-stage2-20040120.spec similarity index 86% rename from examples/livecd/x86/x86-livecd-stage2-20040114.spec rename to examples/livecd/x86/x86-livecd-stage2-20040120.spec index f0051a16..ad23ebad 100644 --- a/examples/livecd/x86/x86-livecd-stage2-20040114.spec +++ b/examples/livecd/x86/x86-livecd-stage2-20040120.spec @@ -1,12 +1,12 @@ subarch: x86 -version_stamp: 20040114 +version_stamp: 20040120 target: livecd-stage2 rel_type: default rel_version: 1.4 -snapshot: 20040114 -source_subpath: default-x86-1.4/livecd-stage1-x86-20040114 -livecd/looptype: normal -livecd/archscript: examples/livecd/runscript/x86-archcript.sh +snapshot: 20040120 +source_subpath: default-x86-1.4/livecd-stage1-x86-20040120 +livecd/cdfstype: normal +livecd/archscript: examples/livecd/runscript/x86-archscript.sh livecd/runscript: examples/livecd/runscript/default-runscript.sh livecd/cdtar: examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 boot/kernel: gentoo diff --git a/modules/targets.py b/modules/targets.py index 4b4ca1d8..412b1643 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -411,13 +411,6 @@ class livecd_stage1_target(generic_stage_target): class livecd_stage2_target(generic_stage_target): def __init__(self,spec,addlargs): self.required_values=["boot/kernel","livecd/cdfstype","livecd/archscript","livecd/runscript"] - if self.settings.has_key("livecd/cdtar"): - if not os.path.exists(self.settings["livecd/cdtar"]): - raise CatalystError, "Cannot locate specified livecd/cdtar: "+self.settings["livecd/cdtar"] - if not os.path.exists(self.settings["livecd/runscript"]): - raise CatalystError, "Cannot locate specified livecd/runscript: "+self.settings["livecd/runscript"] - if not os.path.exists(self.settings["livecd/archscript"]): - raise CatalystError, "Cannot locate specified livecd/archscript: "+self.settings["livecd/archscript"] if not addlargs.has_key("boot/kernel"): raise CatalystError, "Required value boot/kernel not specified." if type(addlargs["boot/kernel"]) == types.StringType: @@ -430,7 +423,19 @@ class livecd_stage2_target(generic_stage_target): self.valid_values=self.required_values[:] self.valid_values.extend(["livecd/cdtar","livecd/empty","livecd/rm","livecd/unmerge"]) generic_stage_target.__init__(self,spec,addlargs) - + if self.settings.has_key("livecd/cdtar"): + if not os.path.exists(self.settings["livecd/cdtar"]): + raise CatalystError, "Cannot locate specified livecd/cdtar: "+self.settings["livecd/cdtar"] + for myscript in ["livecd/archscript","livecd/runscript"]: + if self.settings[myscript][0]=="/": + if not os.path.exists(self.settings[myscript]): + raise CatalystError, "Cannot locate specified "+myscript+": "+self.settings[myscript] + elif os.path.exists(os.getcwd()+"/"+self.settings[myscript]): + self.settings[myscript]=os.getcwd()+"/"+self.settings[myscript] + else: + print os.getcwd()+"/"+self.settings[myscript] + raise CatalystError, "Cannot locate specified "+myscript+": "+self.settings[myscript]+" (2nd try)" + def unmerge(self): if self.settings.has_key("livecd/unmerge"): if type(self.settings["livecd/unmerge"])==types.StringType: @@ -441,8 +446,11 @@ class livecd_stage2_target(generic_stage_target): myunmerge[x]="'"+myunmerge[x]+"'" myunmerge=string.join(myunmerge) #before cleaning, unmerge stuff: - cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/unmerge.sh "+myunmerge,"unmerge script failed.") - + try: + cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/unmerge.sh "+myunmerge,"unmerge script failed.") + except CatalystError: + self.unbind() + raise def setupfs(self): try: cmd("/bin/bash "+self.settings["livecd/runscript"]+" cdfs","cdfs runscript failed.") @@ -476,6 +484,9 @@ class livecd_stage2_target(generic_stage_target): cmd("/bin/bash "+self.settings["livecd/runscript"]+" cdfs","cdfs runscript failed.") print "livecd-stage3: complete!" + def run_local(self): + pass + def run_local(self): mynames=self.settings["boot/kernel"] if type(mynames)==types.StringType: diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh index 9f540487..84f09ed7 100755 --- a/targets/livecd-stage1/livecd-stage1.sh +++ b/targets/livecd-stage1/livecd-stage1.sh @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.5 2004/01/12 06:46:55 drobbins Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.6 2004/01/20 23:56:43 drobbins Exp $ case $1 in enter) @@ -20,12 +20,25 @@ run) USE="build" emerge portage #turn off auto-use: export USE_ORDER="env:conf:defaults" - if [ -n "${clst_PKGCACHE}" ] - then - emerge --usepkg --buildpkg --noreplace $* || exit 1 - else - emerge --noreplace $* || exit 1 - fi + for x in $* + do + if [ -n "${clst_PKGCACHE}" ] + then + emerge --usepkg --buildpkg "\$x" || exit 1 + if [ "\$?" -ne 0 ] + then + echo "\$x failed to build." + exit 1 + fi + else + emerge "\$x" + if [ "\$?" -ne 0 ] + then + echo "\$x failed to build." + exit 1 + fi + fi + done EOF [ $? -ne 0 ] && exit 1 ;; diff --git a/targets/livecd-stage2/unmerge.sh b/targets/livecd-stage2/unmerge.sh new file mode 100644 index 00000000..68cce185 --- /dev/null +++ b/targets/livecd-stage2/unmerge.sh @@ -0,0 +1,8 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/unmerge.sh,v 1.1 2004/01/20 23:56:43 drobbins Exp $ + +$clst_CHROOT $clst_chroot_path /bin/bash << EOF + emerge -C $* +EOF +exit 0