From eafe567bb1fe19123d4a4428a26ab1ea4d7318b1 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Sun, 11 Jan 2004 23:28:47 +0000 Subject: [PATCH] All the "livecd-stage3/*" variables are renamed to "livecd/*" git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@133 d1e1f19c-881f-0410-ab34-b69fee027534 --- .../runscript/x86-isolinux-loop-example.sh | 16 +++++------ .../x86/x86-livecd-stage1-20040110.spec | 4 +-- .../x86/x86-livecd-stage2-20031215.spec | 10 ------- .../x86/x86-livecd-stage2-20040110.spec | 1 + .../x86/x86-livecd-stage3-20040110.spec | 10 +++---- modules/targets.py | 28 +++++++++---------- 6 files changed, 30 insertions(+), 39 deletions(-) delete mode 100644 examples/livecd/x86/x86-livecd-stage2-20031215.spec diff --git a/examples/livecd/runscript/x86-isolinux-loop-example.sh b/examples/livecd/runscript/x86-isolinux-loop-example.sh index f7b575cb..75b50e5b 100644 --- a/examples/livecd/runscript/x86-isolinux-loop-example.sh +++ b/examples/livecd/runscript/x86-isolinux-loop-example.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/x86-isolinux-loop-example.sh,v 1.3 2004/01/11 18:41:20 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/examples/livecd/runscript/Attic/x86-isolinux-loop-example.sh,v 1.4 2004/01/11 23:28:47 drobbins Exp $ die() { echo "$1" @@ -11,11 +11,11 @@ die() { # # runscript: run # runscript: preclean (bind mounts still mounted) -# catalyst: do livecd-stage3/unmerge (bind mounts still mounted) +# catalyst: do livecd/unmerge (bind mounts still mounted) # catalyst: bind mounts unmounted -# catalyst: do livecd-stage3/empty -# catalyst: do livecd-stage3/delete -# runscript: livecd-stage3/clean +# catalyst: do livecd/empty +# catalyst: do livecd/delete +# runscript: livecd/clean # runscript: cdroot_setup case $1 in @@ -37,7 +37,7 @@ EOF [ $? -ne 0 ] && exit 1 ;; clean) - #livecd-stage3/unmerge, bind-unmount, and livecd-stage3/{empty,delete,prune} + #livecd/unmerge, bind-unmount, and livecd/{empty,delete,prune} #have already executed at this point. You now have the opportunity to perform #any additional cleaning steps that may be required. find $clst_chroot_path/usr/lib -iname "*.pyc" -exec rm -f {} \; @@ -50,8 +50,8 @@ cdroot_setup) #mount it, copy our bootable filesystem over, umount it, and we then have a #ready-to-burn ISO tree at $clst_cdroot_path. - cdtar=$clst_livecd_stage3_cdtar - [ "$cdtar" = "" ] && die "No livecd-stage3/cdtar specified (required)" + cdtar=$clst_livecd_cdtar + [ "$cdtar" = "" ] && die "No livecd/cdtar specified (required)" tar xjpvf $cdtar -C $clst_cdroot_path || die "Couldn't extract cdtar $cdtar" if [ "$clst_boot_kernel" = "" ] then diff --git a/examples/livecd/x86/x86-livecd-stage1-20040110.spec b/examples/livecd/x86/x86-livecd-stage1-20040110.spec index ee14bc8e..a9b6880b 100644 --- a/examples/livecd/x86/x86-livecd-stage1-20040110.spec +++ b/examples/livecd/x86/x86-livecd-stage1-20040110.spec @@ -5,9 +5,9 @@ rel_type: default rel_version: 1.4 snapshot: 20040110 source_subpath: default-x86-1.4/stage3-x86-20040107 -livecd-stage1/use: +livecd/use: -X -gtk -livecd-stage1/packages: +livecd/packages: irssi aumix diff --git a/examples/livecd/x86/x86-livecd-stage2-20031215.spec b/examples/livecd/x86/x86-livecd-stage2-20031215.spec deleted file mode 100644 index de1ea157..00000000 --- a/examples/livecd/x86/x86-livecd-stage2-20031215.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: x86 -version_stamp: 20031215 -target: livecd-stage2 -rel_type: default -rel_version: 1.4 -snapshot: 20031215 -source_subpath: default-x86-1.4/livecd-stage1-x86-20031215 -boot/kernel: gentoo -boot/kernel/gentoo/sources: =sys-kernel/gentoo-dev-sources-2.6.0 -boot/kernel/gentoo/config: /path/to/mykernelconfig diff --git a/examples/livecd/x86/x86-livecd-stage2-20040110.spec b/examples/livecd/x86/x86-livecd-stage2-20040110.spec index cf2ea534..cbcddc58 100644 --- a/examples/livecd/x86/x86-livecd-stage2-20040110.spec +++ b/examples/livecd/x86/x86-livecd-stage2-20040110.spec @@ -5,6 +5,7 @@ rel_type: default rel_version: 1.4 snapshot: 20040110 source_subpath: default-x86-1.4/livecd-stage1-x86-20040110 +livecd/runscript: /var/home/drobbins/cvs/gentoo/src/catalyst/examples/livecd/runscript/x86-isolinux-loop-example.sh boot/kernel: gentoo boot/kernel/gentoo/sources: =sys-kernel/gentoo-dev-sources-2.6.1 boot/kernel/gentoo/config: /var/home/drobbins/cvs/gentoo/src/catalyst/examples/livecd/x86/config-2.6.1-x86 diff --git a/examples/livecd/x86/x86-livecd-stage3-20040110.spec b/examples/livecd/x86/x86-livecd-stage3-20040110.spec index 060b05ee..2a9571a0 100644 --- a/examples/livecd/x86/x86-livecd-stage3-20040110.spec +++ b/examples/livecd/x86/x86-livecd-stage3-20040110.spec @@ -6,12 +6,12 @@ rel_version: 1.4 snapshot: 20040110 source_subpath: default-x86-1.4/livecd-stage2-x86-20040110 boot/kernel: gentoo -livecd-stage3/cdtar: /var/home/drobbins/cvs/gentoo/src/catalyst/examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 -livecd-stage3/runscript: /var/home/drobbins/cvs/gentoo/src/catalyst/examples/livecd/runscript/x86-isolinux-loop-example.sh -livecd-stage3/unmerge: +livecd/runscript: /var/home/drobbins/cvs/gentoo/src/catalyst/examples/livecd/runscript/x86-isolinux-loop-example.sh +livecd/cdtar: /var/home/drobbins/cvs/gentoo/src/catalyst/examples/livecd/cdtar/isolinux-2.08-cdtar.tar.bz2 +livecd/unmerge: autoconf automake bin86 binutils libtool m4 bison ld.so make perl patch linux-headers man-pages sash bison flex gettext texinfo ccache addpatches man groff lib-compat gcc python miscfiles ucl -livecd-stage3/empty: +livecd/empty: /var/tmp /var/cache /var/db @@ -43,7 +43,7 @@ livecd-stage3/empty: /usr/src /usr/share/doc /usr/share/man -livecd-stage3/rm: +livecd/rm: /lib/*.a /usr/lib/*.a /usr/lib/gcc-lib/*/*/libgcj* diff --git a/modules/targets.py b/modules/targets.py index 5abb74a8..cd2687b1 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -460,21 +460,21 @@ class livecd_stage2_target(generic_stage_target): class livecd_stage3_target(generic_stage_target): def __init__(self,spec,addlargs): - self.required_values=["boot/kernel","livecd-stage3/runscript"] + self.required_values=["boot/kernel","livecd/runscript"] self.valid_values=self.required_values[:] - self.valid_values.extend(["livecd-stage3/cdtar","livecd-stage3/empty","livecd-stage3/rm","livecd-stage3/unmerge"]) + 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-stage3/cdtar"): - if not os.path.exists(self.settings["livecd-stage3/cdtar"]): - raise CatalystError, "Cannot locate specified livecd-stage3/cdtar: "+self.settings["livecd-stage3/cdtar"] - if not os.path.exists(self.settings["livecd-stage3/runscript"]): - raise CatalystError, "Cannot locate specified livecd-stage3/runscript: "+self.settings["livecd-stage3/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"] def unmerge(self): - if self.settings["target"]=="livecd-stage3" and self.settings.has_key("livecd-stage3/unmerge"): - if type(self.settings["livecd-stage3/unmerge"])==types.StringType: - self.settings["livecd-stage3/unmerge"]=[self.settings["livecd-stage3/unmerge"]] - myunmerge=self.settings["livecd-stage3/unmerge"][:] + if self.settings["target"]=="livecd-stage3" and self.settings.has_key("livecd/unmerge"): + if type(self.settings["livecd/unmerge"])==types.StringType: + 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 myunmerge[x]='"'+myunmerge[x]+'"' @@ -484,14 +484,14 @@ class livecd_stage3_target(generic_stage_target): def run_local(self): try: - cmd("/bin/bash "+self.settings["livecd-stage3/runscript"]+" run","runscript failed") + cmd("/bin/bash "+self.settings["livecd/runscript"]+" run","runscript failed") except CatalystError: self.unbind() raise CatalystError,"Stage build aborting due to error." def preclean(self): try: - cmd("/bin/bash "+self.settings["livecd-stage3/runscript"]+" preclean","preclean runscript failed.") + cmd("/bin/bash "+self.settings["livecd/runscript"]+" preclean","preclean runscript failed.") except: self.unbind() raise @@ -499,7 +499,7 @@ class livecd_stage3_target(generic_stage_target): def cdroot_setup(self): if not os.path.exists(self.settings["cdroot_path"]): os.makedirs(self.settings["cdroot_path"]) - cmd("/bin/bash "+self.settings["livecd-stage3/runscript"]+" cdroot_setup","preclean runscript failed.") + cmd("/bin/bash "+self.settings["livecd/runscript"]+" cdroot_setup","preclean runscript failed.") print "livecd-stage3: complete!" def register(foo): -- 2.26.2