latest goodies

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

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 0315aeddf5025669b939b75e0d1251cfe5e42cb5..c741da9e7002e1509b3ec0d06d9796c01b40e57a 100644 (file)
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -18,6 +18,11 @@ def die(msg=None):
 def warn(msg):
        print "catalyst: "+msg
 
+def cmd(mycmd,myexc=""):
+       retval=os.system(mycmd)
+       if retval != 0:
+               raise CatalystError,myexc
+
 def ismount(path):
        "enhanced to handle bind mounts"
        if os.path.ismount(path):

diff --git a/modules/targets.py b/modules/targets.py
index c4eaf302338b832b68b190a27d17b2003109c127..8d5b0138ac09c80c7a2a71f0fc5fbe31861363f4 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -47,8 +47,8 @@ class generic_stage_target(generic_target):
                        fh.close()      
                #call arch constructor, pass our settings
                self.arch=self.subarchmap[self.settings["subarch"]](self.settings)
-               self.settings["target_subpath"]=self.settings["rel_type"]+"-"+self.settings["mainarch"]+"-"+self.settings["rel_version"]
-               self.settings["target_subpath"]+="/"+self.settings["target"]+"-"+self.settings["subarch"]+"-"+self.settings["version_stamp"]
+               self.settings["target_profile"]=self.settings["rel_type"]+"-"+self.settings["mainarch"]+"-"+self.settings["rel_version"]
+               self.settings["target_subpath"]=self.settings["target_profile"]+"/"+self.settings["target"]+"-"+self.settings["subarch"]+"-"+self.settings["version_stamp"]
                st=self.settings["storedir"]
                self.settings["snapshot_path"]=st+"/snapshots/portage-"+self.settings["snapshot"]+".tar.bz2"
                self.settings["target_path"]=st+"/builds/"+self.settings["target_subpath"]+".tar.bz2"
@@ -82,22 +82,16 @@ class generic_stage_target(generic_target):
        def dir_setup(self):
                print "Setting up directories..."
                self.mount_safety_check()
-               retval=os.system("rm -rf "+self.settings["chroot_path"])
-               if retval != 0:
-                       raise CatalystError,"Could not remove existing directory: "+self.settings["chroot_path"]
+               cmd("rm -rf "+self.settings["chroot_path"],"Could not remove existing directory: "+self.settings["chroot_path"])
                os.makedirs(self.settings["chroot_path"])
                if not os.path.exists(self.settings["pkgcache_path"]):
                        os.makedirs(self.settings["pkgcache_path"])
                
        def unpack_and_bind(self):
                print "Unpacking stage tarball..."
-               retval=os.system("tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"])
-               if retval!=0:
-                       raise CatalystError,"Error unpacking tarball"
+               cmd("tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"],"Error unpacking tarball")
                print "Unpacking portage tree snapshot..."
-               retval=os.system("tar xjpf "+self.settings["snapshot_path"]+" -C "+self.settings["chroot_path"]+"/usr")
-               if retval!=0:
-                       raise CatalystError,"Error unpacking 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)
@@ -106,6 +100,9 @@ class generic_stage_target(generic_target):
                        if retval!=0:
                                self.unbind()
                                raise CatalystError,"Couldn't bind mount "+src
+               print "Configuring profile link..."
+               cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.profile","Error zapping profile link")
+               cmd("ln -sf ../usr/portage/profiles/"+self.settings["target_profile"]+" "+self.settings["chroot_path"]+"/etc/make.profile","Error creating profile link")
 
        def unbind(self):
                ouch=0
@@ -127,9 +124,7 @@ class generic_stage_target(generic_target):
                        raise CatalystError,"Couldn't umount one or more bind-mounts; aborting for safety."
 
        def chroot_setup(self):
-               retval=os.system("cp /etc/resolv.conf "+self.settings["chroot_path"]+"/etc")
-               if retval!=0:
-                       raise CatalystError,"Could not copy resolv.conf into place."
+               cmd("cp /etc/resolv.conf "+self.settings["chroot_path"]+"/etc","Could not copy resolv.conf into place.")
                #Ugly bunch of sed commands to get /etc/make.conf to hold the correct default values for the stage
                #we're building. This way, when a user uses a pentium4 stage3, it is set up to compile for pentium4
                #using the CFLAGS and USE settings we used. It's possible that this would look nicer written in
@@ -150,25 +145,24 @@ class generic_stage_target(generic_target):
                mycmds.append(sedcmd)
                for x in mycmds:
                        mycmd=x+" "+self.settings["chroot_path"]+"/etc/make.conf"
-                       retval=os.system(mycmd)
-                       if retval != 0:
-                               raise CatalystError, "Sed command failed: "+mycmd
+                       cmd(mycmd,"Sed command failed: "+mycmd)
 
        def clean(self):
                "do not call without first unbinding; this code needs a cleanup once it stabilizes"
-               os.system("rm -f "+self.settings["chroot_path"]+"/etc/ld.so.preload")
-               retval=os.system("rm -f "+self.settings["chroot_path"]+"/etc/resolv.conf")
-               if retval!=0:
-                       raise CatalystError,"Could not clean up resolv.conf."
-               retval=os.system("rm -rf "+self.settings["chroot_path"]+"/usr/portage")
-               if retval!=0:
-                       raise CatalystError,"Could not clean up Portage tree."
-               retval=os.system("rm -rf "+self.settings["chroot_path"]+"/var/tmp/*")
-               if retval!=0:
-                       raise CatalystError,"Could not clean up Portage tree."
-               retval=os.system(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean")
-               if retval!=0:
-                       raise CatalystError,"clean script failed."
+               for x in ["/etc/resolv.conf","/usr/portage","/var/tmp/*","/tmp/*","/root/*"]: 
+                       cmd("rm -rf "+self.settings["chroot_path"]+x,"Couldn't clean "+x)
+               cmd(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean","clean script failed.")
+               
+       def capture(self):
+               """capture target in a tarball"""
+               mypath=self.settings["target_path"].split("/")
+               #remove filename from path
+               mypath=string.join(mypath[:-1],"/")
+               #now make sure path exists
+               if not os.path.exists(mypath):
+                       os.makedirs(mypath)
+               print "Creating stage tarball..."
+               cmd("tar cjf "+self.settings["target_path"]+" -C "+self.settings["chroot_path"]+" .","Couldn't create stage tarball")
                
        def run(self):
                self.dir_setup()
@@ -184,14 +178,14 @@ class generic_stage_target(generic_target):
                        if type(self.settings[x])==types.StringType:
                                #prefix to prevent namespace clashes:
                                os.environ["clst_"+x]=self.settings[x]
+                       elif type(self.settings[x])==types.ListType:
+                               os.environ["clst_"+x]=string.join(self.settings[x])
                try:
-                       retval=os.system(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh run")
-                       if retval!=0:
-                               raise CatalystError,"build script failed."
+                       cmd(self.settings["storedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh run","build script failed")
                finally:
                        self.unbind()
                self.clean()
-
+               self.capture()
                        
 class snapshot_target(generic_target):
        def __init__(self,myspec,addlargs):
@@ -217,26 +211,18 @@ class snapshot_target(generic_target):
                print "Creating Portage tree snapshot "+self.settings["version_stamp"]+" from "+self.settings["portdir"]+"..."
                mytmp=self.settings["tmp_path"]
                if os.path.exists(mytmp):
-                       retval=os.system("rm -rf "+mytmp)
-                       if retval != 0:
-                               raise CatalystError, "Could not remove existing directory: "+mytmp
+                       cmd("rm -rf "+mytmp,"Could not remove existing directory: "+mytmp)
                os.makedirs(mytmp)
-               retval=os.system("rsync -a --exclude /packages/ --exclude /distfiles/ --exclude CVS/ "+self.settings["portdir"]+"/ "+mytmp+"/portage/")
-               if retval != 0:
-                       raise CatalystError,"Snapshot failure"
+               cmd("rsync -a --exclude /packages/ --exclude /distfiles/ --exclude CVS/ "+self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure")
                print "Compressing Portage snapshot tarball..."
-               retval=os.system("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage")
-               if retval != 0:
-                       raise CatalystError,"Snapshot creation failure"
+               cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage","Snapshot creation failure")
                self.cleanup()
 
        def cleanup(self):
                mytmp=self.settings["tmp_path"]+"/"+self.settings["target_subpath"]
                print "Cleaning up temporary snapshot directory..."
                #Be a good citizen and clean up after ourselves
-               retval=os.system("rm -rf "+mytmp)
-               if retval != 0:
-                       raise CatalystError,"Snapshot cleanup failure"
+               cmd("rm -rf "+mytmp,"Snapshot cleanup failure")
                        
 class stage1_target(generic_stage_target):
        def __init__(self,spec,addlargs):

diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh
index fd3e02727a3bd6d7ce7081d80f40391e3fa53bd8..0c92da506e6cdd745a4359015b81082c1eb052b7 100755 (executable)
--- a/targets/stage2/stage2.sh
+++ b/targets/stage2/stage2.sh
@@ -1,19 +1,31 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.2 2003/10/28 22:09:23 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.3 2003/10/30 06:21:08 drobbins Exp $
 
 case $1 in
+enter)
+       $clst_CHROOT $clst_chroot_path
+       ;;
 run)
-       $CHROOT . /bin/bash << EOF
+       $clst_CHROOT $clst_chroot_path /bin/bash << EOF
        env-update
        source /etc/profile
-       mkdir -p /usr/portage/packages/All
-       export EMERGE_OPTS="--usepkg --buildpkg"
-       if [ ${CCACHE} -eq 1 ]
+       cat /etc/make.profile/make.defaults | grep GRP_STAGE23_USE > /tmp/stage23
+       source /tmp/stage23
+       export USE="-* \${clst_HOSTUSE} \${GRP_STAGE23_USE}"
+       echo
+       echo "USE variables active: \${USE}"
+       rm -f /tmp/stage23
+       echo
+       if [ -n "${clst_CCACHE}" ]
        then
+               export FEATURES="ccache"        
                emerge --oneshot --nodeps ccache || exit 1
        fi
-
+       if [ -n "${clst_PKGCACHE}" ]
+       then
+               export EMERGE_OPTS="--usepkg --buildpkg"
+       fi
        /usr/portage/scripts/bootstrap.sh || exit 1
 EOF
        [ $? -ne 0 ] && exit 1 
@@ -21,13 +33,13 @@ EOF
 clean)
        # we need to have catalyst un-bind-mount things before
        # we clean up.
-       $CHROOT . /bin/bash << EOF
-       if [ ${CCACHE} -eq 1 ]
+       $clst_CHROOT $clst_chroot_path /bin/bash << EOF
+       env-update
+       source /etc/profile
+       if [ -n "${clst_CCACHE}" ]
        then
-               emerge -C ccache
+               emerge -C dev-util/ccache || exit 1
        fi
-       rm -rf /usr/portage
-       rm -rf /tmp/*
 EOF
        [ $? -ne 0 ] && exit 1 
        ;;
@@ -35,3 +47,4 @@ EOF
        exit 1
        ;;
 esac
+exit 0

diff --git a/targets/stage3/stage3.sh b/targets/stage3/stage3.sh
index 9d0eb4c484c48bd01868e414dca10cddbab433a2..f6bb06bbd4e78716ece3f0414163fcb5f1c78a9d 100755 (executable)
--- a/targets/stage3/stage3.sh
+++ b/targets/stage3/stage3.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/stage3/Attic/stage3.sh,v 1.4 2003/10/29 08:03:00 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.5 2003/10/30 06:21:08 drobbins Exp $
 
 case $1 in
 enter)
@@ -10,10 +10,17 @@ run)
        $clst_CHROOT $clst_chroot_path /bin/bash << EOF
        env-update
        source /etc/profile
+       cat /etc/make.profile/make.defaults | grep GRP_STAGE23_USE > /tmp/stage23
+       source /tmp/stage23
+       export USE="-* \${clst_HOSTUSE} \${GRP_STAGE23_USE}"
+       echo
+       echo "USE variables active: \${USE}"
+       rm -f /tmp/stage23
+       echo
        if [ -n "${clst_CCACHE}" ]
        then
                export FEATURES="ccache"
-               emerge --oneshot --nodeps --usepkg --buildpkg ccache || exit 1
+               emerge --oneshot --nodeps ccache || exit 1
        fi
        if [ ${clst_rel_type} = "hardened" ]
        then