grp fix; livecd stuff, some remaining examples/ cleanup/updates

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

diff --git a/catalyst b/catalyst
index 9c37fc026c359c04e1c5a27407c0eb5d8a56a723..8337824ece92454a3e340f0b0aa58dacef6008ad 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -72,7 +72,7 @@ if sys.argv[1] in ["-f", "--file" ]:
        try:
                addlargs=read_spec(sys.argv[2])
        except:
-               raise CatalystError,"Unable to read spec file",sys.argv[2]
+               raise CatalystError,"Unable to read spec file: "+sys.argv[2]
        unparsedargs=sys.argv[3:]
 else:
        addlargs={}

diff --git a/examples/livecd/x86/x86-livecd-stage1-20030110.spec b/examples/livecd/x86/x86-livecd-stage1-20030110.spec
new file mode 100644 (file)
index 0000000..ee14bc8
--- /dev/null
+++ b/examples/livecd/x86/x86-livecd-stage1-20030110.spec
@@ -0,0 +1,13 @@
+subarch: x86
+version_stamp: 20040110
+target: livecd-stage1
+rel_type: default
+rel_version: 1.4
+snapshot: 20040110
+source_subpath: default-x86-1.4/stage3-x86-20040107
+livecd-stage1/use:
+       -X
+       -gtk
+livecd-stage1/packages:
+       irssi
+       aumix

diff --git a/examples/livecd/x86/x86-livecd-stage1-20031215.spec b/examples/livecd/x86/x86-livecd-stage1-20031215.spec
deleted file mode 100644 (file)
index 466c531..0000000
--- a/examples/livecd/x86/x86-livecd-stage1-20031215.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: x86
-version_stamp: 20031215
-target: livecd-stage1
-rel_type: default
-rel_version: 1.4
-snapshot: 20031215
-source_subpath: default-x86-1.4/stage3-x86-20031215
-livecd-stage1/packages:
-       irssi
-       aumix

diff --git a/modules/targets.py b/modules/targets.py
index 983defd633ebda8c7f90bb31d5a48378b075a9e4..fa7590ed3fba4e389ed4ade3239d3fbd314c7700 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -1,8 +1,9 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
 
-import os,stat,string,imp,types
+import os,string,imp,types,shutil
 from catalyst_support import *
+from stat import *
 
 class generic_target:
 
@@ -81,15 +82,19 @@ class generic_stage_target(generic_target):
                        self.settings["source_path"]=st+"/builds/"+self.settings["source_subpath"]+".tar.bz2"
                elif self.settings["target"] == "livecd-stage2":
                        #we have a main directory and a tarball in this case
-                       os.makedirs(st+"/builds/"+self.settings["target_subpath"])
+                       #making these directories before we clean doesn't make sense:
+                       #os.makedirs(st+"/builds/"+self.settings["target_subpath"])
+                       self.settings["binaries_target_path"]=st+"/builds/"+self.settings["target_subpath"]+"/binaries"
                        self.settings["target_path"]=st+"/builds/"+self.settings["target_subpath"]+"/"+self.settings["target_subpath"]+".tar.bz2"
                        self.settings["source_path"]=st+"/builds/"+self.settings["source_subpath"]+".tar.bz2"
                elif self.settings["target"]=="livecd-stage3":
-                       # the loop-prep/ dir is for unpacking the chroot image, and will be used to prep it.
-                       self.settings["target_path"]=st+"/builds/"+self.settings["target_subpath"]+"/loop-prep"
                        self.settings["cdroot_path"]=st+"/builds/"+self.settings["target_subpath"]+"/cdroot"
-                       os.makedirs(self.settings["target_path"])
-                       os.makedirs(self.settings["cdroot_path"])
+                       #making these directories before we clean doesn't make sense:
+                       #if not os.path.exists(self.settings["target_path"]):
+                       #       os.makedirs(self.settings["target_path"])
+                       #if not os.path.exists(self.settings["cdroot_path"]):
+                       #       os.makedirs(self.settings["cdroot_path"])
+                       self.settings["binaries_source_path"]=st+"/builds/"+self.settings["source_subpath"]+"/binaries"
                        self.settings["source_path"]=st+"/builds/"+self.settings["source_subpath"]+"/"+self.settings["source_subpath"]+".tar.bz2"
                else:
                        self.settings["target_path"]=st+"/builds/"+self.settings["target_subpath"]+".tar.bz2"
@@ -111,7 +116,7 @@ class generic_stage_target(generic_target):
                        self.mountmap["/tmp/grp"]=self.settings["target_path"]
                if self.settings["target"]=="livecd-stage2":
                        self.mounts.append("/tmp/binaries")
-                       self.mountmap["/tmp/binaries"]=st+"/builds/"+self.settings["target_subpath"]+"/binaries"
+                       self.mountmap["/tmp/binaries"]=self.settings["binaries_target_path"]
                        
        def mount_safety_check(self):
                mypath=self.settings["chroot_path"]
@@ -147,8 +152,10 @@ class generic_stage_target(generic_target):
        def unpack_and_bind(self):
                print "Unpacking stage tarball..."
                cmd("tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"],"Error unpacking tarball")
-               print "Unpacking portage tree snapshot..."
-               cmd("tar xjpf "+self.settings["snapshot_path"]+" -C "+self.settings["chroot_path"]+"/usr","Error unpacking snapshot")
+               if self.settings["target"] not in ["livecd-stage3"]:
+                       #a livecd-stage2 isn't "cleaned up" so there's no need to re-extract the portage snapshot
+                       print "Unpacking portage tree snapshot..."
+                       cmd("tar xjpf "+self.settings["snapshot_path"]+" -C "+self.settings["chroot_path"]+"/usr","Error unpacking snapshot")
                for x in self.mounts: 
                        if not os.path.exists(self.settings["chroot_path"]+x):
                                os.makedirs(self.settings["chroot_path"]+x)
@@ -212,26 +219,47 @@ class generic_stage_target(generic_target):
                
        def clean(self):
                destpath=self.settings["chroot_path"]
-               cleanables=["/etc/resolv.conf","/usr/portage","/var/tmp/*","/tmp/*","/root/*","/root/.ccache"]
+               
+               cleanables=["/etc/resolv.conf","/var/tmp/*","/tmp/*","/root/*","/root/.ccache"]
+               if self.settings["target"] not in ["livecd-stage2"]:
+                       #we don't need to clean up a livecd-stage2
+                       cleanables.append("/usr/portage")
                if self.settings["target"]=="stage1":
                        destpath+="/tmp/stage1root"
                        #this next stuff can eventually be integrated into the python and glibc ebuilds themselves (USE="build"):
                        cleanables.extend(["/usr/share/gettext","/usr/lib/python2.2/test","/usr/lib/python2.2/encodings","/usr/lib/python2.2/email","/usr/lib/python2.2/lib-tk","/usr/share/zoneinfo"])
-               if self.settings["target"]=="livecd-stage3":
-                       if self.settings.has_key("livecd-stage3/clean"):
-                               if type(self.settings["livecd-stage3/clean"])==types.StringType:
-                                       cleanables.append(self.settings["livecd-stage3/clean"])
-                               else:
-                                       #a list of directories to clean
-                                       cleanables.extend(self.settings["livecd-stage3/clean"])
                for x in cleanables: 
                        print "Cleaning chroot: "+x+"..."
                        cmd("rm -rf "+destpath+x,"Couldn't clean "+x)
-               cmd(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean","clean script failed.")
+               if self.settings["target"]=="livecd-stage3":
+                       if self.settings.has_key("livecd-stage3/empty"):
+                               if type(self.settings["livecd-stage3/empty"])==types.StringType:
+                                       self.settings["livecd-stage3/empty"]=[self.settings["livecd-stage3/empty"]]
+                               for x in self.settings["livecd-stage3/empty"]:
+                                       myemp=self.settings["chroot_path"]+x
+                                       if not os.path.isdir(myemp):
+                                               print x,"not a directory or does not exist, skipping 'empty' operation."
+                                               continue
+                                       print "Emptying directory",x
+                                       #stat the dir, delete the dir, recreate the dir and set the proper perms and ownership
+                                       mystat=os.stat(myemp)
+                                       shutil.rmtree(myemp)
+                                       os.makedirs(myemp)
+                                       os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
+                                       os.chmod(myemp,mystat[ST_MODE])
+                       if self.settings.has_key("livecd-stage3/rm"):   
+                               if type(self.settings["livecd-stage3/rm"])==types.StringType:
+                                       self.settings["livecd-stage3/rm"]=[self.settings["livecd-stage3/rm"]]
+                               for x in self.settings["livecd-stage3/rm"]:
+                                       #we're going to shell out for all these cleaning operations, so we get easy glob handling
+                                       print "livecd: removing "+x
+                                       os.system("rm -rf "+self.settings["chroot_path"]+x)
+               if self.settings["target"]!="livecd-stage3":
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean","clean script failed.")
        
        def preclean(self):
                try:
-                       cmd(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh preclean","preclean script failed.")
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh preclean","preclean script failed.")
                except:
                        self.unbind()
                        raise
@@ -252,7 +280,7 @@ class generic_stage_target(generic_target):
 
        def run_local(self):
                try:
-                       cmd(self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh run","build script failed")
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh run","build script failed")
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"Stage build aborting due to error."
@@ -268,9 +296,9 @@ class generic_stage_target(generic_target):
                #modify the current environment. This is an ugly hack that should be fixed. We need this
                #to use the os.system() call since we can't specify our own environ:
                for x in self.settings.keys():
-                       varname="clst_"+x
                        #"/" is replaced with "_", "-" is also replaced with "_"
-                       string.replace(varname,"/-","__")
+                       varname="clst_"+string.replace(x,"/","_")
+                       varname=string.replace(varname,"-","_")
                        if type(self.settings[x])==types.StringType:
                                #prefix to prevent namespace clashes:
                                os.environ[varname]=self.settings[x]
@@ -280,8 +308,10 @@ class generic_stage_target(generic_target):
                self.run_local()
                if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage3"]:
                        self.preclean()
+               if self.settings["target"] in ["livecd-stage3"]:
+                       self.unmerge()
                self.unbind()
-               if self.settings["target"] in ["stage1","stage2","stage3"]:
+               if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage3"]:
                        #clean is for removing things after bind-mounts are unmounted (general file removal and cleanup)
                        self.clean()
                if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage1","livecd-stage2"]:
@@ -355,8 +385,12 @@ class grp_target(generic_stage_target):
        def run_local(self):
                for pkgset in self.settings["grp"]:
                        #example call: "grp.sh run pkgset cd1 xmms vim sys-apps/gleep"
+                       mypackages=self.settings["grp/"+pkgset+"/packages"]
+                       for x in range(0,len(mypackages)):
+                               mypackages[x]='"'+mypackages[x]+'"'
+                       mypackages=string.join(mypackages)
                        try:
-                               cmd(self.settings["sharedir"]+"/targets/grp/grp.sh run "+self.settings["grp/"+pkgset+"/type"]+" "+pkgset+" "+string.join(self.settings["grp/"+pkgset+"/packages"]))
+                               cmd("/bin/bash "+self.settings["sharedir"]+"/targets/grp/grp.sh run "+self.settings["grp/"+pkgset+"/type"]+" "+pkgset+" "+mypackages)
                        except CatalystError:
                                self.unbind()
                                raise CatalystError,"GRP build aborting due to error."
@@ -371,7 +405,7 @@ class tinderbox_target(generic_stage_target):
                #tinderbox
                #example call: "grp.sh run xmms vim sys-apps/gleep"
                try:
-                       cmd(self.settings["sharedir"]+"/targets/tinderbox/tinderbox.sh run "+string.join(self.settings["tinderbox/packages"]))
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/tinderbox/tinderbox.sh run "+string.join(self.settings["tinderbox/packages"]))
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"Tinderbox aborting due to error."
@@ -384,7 +418,7 @@ class livecd_stage1_target(generic_stage_target):
 
        def run_local(self):
                try:
-                       cmd(self.settings["sharedir"]+"/targets/livecd-stage1/livecd-stage1.sh run "+string.join(self.settings["livecd-stage1/packages"]))
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/livecd-stage1/livecd-stage1.sh run "+string.join(self.settings["livecd-stage1/packages"]))
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"GRP build aborting due to error."
@@ -417,7 +451,7 @@ class livecd_stage2_target(generic_stage_target):
                        if retval!=0:
                                raise CatalystError, "Couldn't copy kernel config: "+self.settings["boot/kernel/"+x+"/config"]
                try:
-                       cmd(self.settings["sharedir"]+"/targets/livecd-stage2/livecd-stage2.sh run "+args)
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/livecd-stage2/livecd-stage2.sh run "+args)
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"GRP build aborting due to error."
@@ -426,7 +460,7 @@ class livecd_stage3_target(generic_stage_target):
        def __init__(self,spec,addlargs):
                self.required_values=["boot/kernel","livecd-stage3/runscript"]
                self.valid_values=self.required_values[:]
-               self.valid_values.extend(["livecd-stage3/cdtar","livecd-stage3/clean"])
+               self.valid_values.extend(["livecd-stage3/cdtar","livecd-stage3/empty","livecd-stage3/rm","livecd-stage3/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"]):
@@ -434,24 +468,37 @@ class livecd_stage3_target(generic_stage_target):
                if not os.path.exists(self.settings["livecd-stage3/runscript"]):
                                raise CatalystError, "Cannot locate specified livecd-stage3/runscript: "+self.settings["livecd-stage3/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"][:]
+                       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]+'"'
+                       myunmerge=string.join(myunmerge)
+                       #before cleaning, unmerge stuff:
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/unmerge.sh "+myunmerge,"unmerge script failed.")
 
        def run_local(self):
                try:
-                       cmd(self.settings["livecd-stage3/runscript"]+" run","runscript failed")
+                       cmd("/bin/bash "+self.settings["livecd-stage3/runscript"]+" run","runscript failed")
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"Stage build aborting due to error."
 
        def preclean(self):
                try:
-                       cmd(self.settings["livecd-stage3/runscript"]+" preclean","preclean runscript failed.")
+                       cmd("/bin/bash "+self.settings["livecd-stage3/runscript"]+" preclean","preclean runscript failed.")
                except:
                        self.unbind()
                        raise
 
        def cdroot_setup(self):
-               cmd(self.settings["livecd-stage3/runscript"]+" cdroot_setup","preclean runscript failed.")
+               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.")
+               print "livecd-stage3: complete!"
 
 def register(foo):
        foo.update({"stage1":stage1_target,"stage2":stage2_target,"stage3":stage3_target,

diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index 4bf21435e7fb88daca19f8980d2f4d91fe785529..183ac0f8692d088af333787275f0038e31392573 100755 (executable)
--- a/targets/grp/grp.sh
+++ b/targets/grp/grp.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/grp/Attic/grp.sh,v 1.3 2004/01/07 18:01:46 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.4 2004/01/10 22:23:44 drobbins Exp $
 
 case $1 in
 enter)
@@ -34,11 +34,11 @@ run)
        then
                unset DISTDIR
                export PKGDIR="/tmp/grp/$clst_grp_target"
-               emerge --usepkg --buildpkg --noreplace "$clst_grp_packages" || exit 1
+               emerge --usepkg --buildpkg --noreplace $clst_grp_packages || exit 1
        else
                export DISTDIR="/tmp/grp/$clst_grp_target"
                unset PKGDIR
-               emerge --fetchonly "$clst_grp_packages" || exit 1
+               emerge --fetchonly $clst_grp_packages || exit 1
        fi
 EOF
        [ $? -ne 0 ] && exit 1

diff --git a/targets/livecd-stage3/unmerge.sh b/targets/livecd-stage3/unmerge.sh
new file mode 100644 (file)
index 0000000..992b7f3
--- /dev/null
+++ b/targets/livecd-stage3/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-stage3/Attic/unmerge.sh,v 1.1 2004/01/10 22:23:44 drobbins Exp $
+
+$clst_CHROOT $clst_chroot_path /bin/bash << EOF
+       emerge -C $*
+EOF
+exit 0