misc bugfixes

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

diff --git a/ChangeLog b/ChangeLog
index 400026811a8d4954e2de8bc774ccb4f393bd37ed..308510669e15d040802c82ee2cc0508353b85f56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2004/03/25 00:03:27 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.28 2004/03/26 17:03:29 zhen Exp $
+
+  26 Mar 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript/default-runscript.sh, modules/targets.py,
+  targets/grp/grp.sh, targets/livecd-stage1/livecd-stage1.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage2/stage2.sh,
+  targets/stage3/stage3.sh, targets/tinderbox/tinderbox.sh:
+  fixes for bugs #44625 and #45805
 
   24 Mar 2004; John Davis <zhen@gentoo.org> catalyst,
   livecd/cdtar/isolinux-2.08-memtest86-cdtar.tar.bz2,

diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh
index 959801cc287951513fb8659595cb200692969c33..3c2762da92093d4ab45a485f82726ba1162519d1 100644 (file)
--- a/livecd/runscript/default-runscript.sh
+++ b/livecd/runscript/default-runscript.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/livecd/runscript/Attic/default-runscript.sh,v 1.3 2004/03/25 00:03:27 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.4 2004/03/26 17:03:29 zhen Exp $
 
 #return codes to be used by archscript
 
@@ -73,7 +73,7 @@ create_zisofs()
 create_noloop()
 {
        echo "Copying files for image (no loop)..."
-       cp -a "${clst_chroot_path}/*" "${clst_cdroot_path}" || die "Could not copy files to image (no loop)"
+       cp -a "${clst_chroot_path}"/* "${clst_cdroot_path}" || die "Could not copy files to image (no loop)"
 }
 
 create_gcloop()
@@ -181,7 +181,7 @@ EOF
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.3 2004/03/25 00:03:27 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.4 2004/03/26 17:03:29 zhen Exp $
 
 depend() {
        after *

diff --git a/modules/targets.py b/modules/targets.py
index 316c1f9968245cff8c4ac97254a7c2fa207e0be0..2907beffdf76411bd0fd1306df1b2e5d944e0e65 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.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/Attic/targets.py,v 1.94 2004/03/24 17:24:47 iggy Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.95 2004/03/26 17:03:29 zhen Exp $
 
 import os,string,imp,types,shutil
 from catalyst_support import *
@@ -79,7 +79,8 @@ class generic_stage_target(generic_target):
                        print "Building natively for",self.settings["hostarch"]
                else:
                        print "Building on",self.settings["hostarch"],"for alternate machine type",self.settings["mainarch"]
-                       
+               #we are going to do a little hack for stackable profile integration here.
+               #if rel_version does not exist, then assume that the profile is stackable.
                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"]

diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index 801b44560ba4285324d9a28d81625c1e7a065ce2..7c73a23c59366502cb8ef38303b5965c41527102 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.10 2004/03/19 16:06:37 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.11 2004/03/26 17:03:29 zhen Exp $
 
 case $1 in
 enter)
@@ -30,7 +30,7 @@ run)
     then   
                 export FEATURES="distcc"
                 export DISTCC_HOSTS="${clst_distcc_hosts}"
-                emerge --oneshot --nodeps distcc || exit 1
+                USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
                 echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /etc/passwd
                 /usr/bin/distcc-config --install 2>&1 > /dev/null
                 /usr/bin/distccd 2>&1 > /dev/null

diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh
index f35d367e9d8cf76138405f142e14ba900048054c..3d015320e181aa293a907edde5f2108ada71103b 100755 (executable)
--- 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.7 2004/02/11 03:31:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.8 2004/03/26 17:03:29 zhen Exp $
 
 case $1 in
 enter)
@@ -25,7 +25,7 @@ run)
        then   
                export FEATURES="distcc"
                export DISTCC_HOSTS="${clst_distcc_hosts}"
-               emerge --oneshot --nodeps distcc || exit 1
+               USE="-gtk -gnome" emerge --oneshot --nodeps distcc || exit 1
                echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /$
                /usr/bin/distcc-config --install 2>&1 > /dev/null
                /usr/bin/distccd 2>&1 > /dev/null

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 4bd24e54d7cb51b678a83b10802bec360c2c3d04..4fe6369510257bbe36121ab72bdbe296ca0f195a 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -16,14 +16,14 @@ case $1 in
                        emerge --oneshot --nodeps ccache || exit 1
                fi
                if [ -n "${clst_DISTCC}" ]
-                then   
-                        export FEATURES="distcc"
-                        export DISTCC_HOSTS="${clst_distcc_hosts}"
-                        emerge --oneshot --nodeps distcc || exit 1
+        then   
+               export FEATURES="distcc"
+               export DISTCC_HOSTS="${clst_distcc_hosts}"
+               USE="-gtk -gnome" emerge --oneshot --nodeps distcc || exit 1
                        echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /etc/passwd
-                        /usr/bin/distcc-config --install 2>&1 > /dev/null
-                        /usr/bin/distccd 2>&1 > /dev/null
-                fi
+               /usr/bin/distcc-config --install 2>&1 > /dev/null
+               /usr/bin/distccd 2>&1 > /dev/null
+        fi
                export ROOT=${2}
                install -d $ROOT
                if [ -n "${clst_PKGCACHE}" ]

diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh
index 125091ed0dd808f4ca3111185200cf484ac18887..1311752b9832d06cef2f977873ae08de1f9c8cdf 100755 (executable)
--- a/targets/stage2/stage2.sh
+++ b/targets/stage2/stage2.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/stage2/Attic/stage2.sh,v 1.8 2004/02/11 03:31:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.9 2004/03/26 17:03:29 zhen Exp $
 
 case $1 in
 enter)
@@ -27,7 +27,7 @@ run)
        then
                export FEATURES="distcc"
                export DISTCC_HOSTS="${clst_distcc_hosts}"
-               emerge --oneshot --nodeps distcc || exit 1
+               USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
                echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /etc/passwd
                /usr/bin/distcc-config --install 2>&1 > /dev/null
                /usr/bin/distccd 2>&1 > /dev/null

diff --git a/targets/stage3/stage3.sh b/targets/stage3/stage3.sh
index 2a3e0a3d1728f356e0b2577c877f09e90a78a995..b01b354a0a0f805d0cb5e4d6c0cc4e72d2b7f70e 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.10 2004/03/19 16:06:37 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.11 2004/03/26 17:03:29 zhen Exp $
 
 case $1 in
 enter)
@@ -33,7 +33,7 @@ run)
         then   
                 export FEATURES="distcc"
                 export DISTCC_HOSTS="${clst_distcc_hosts}"
-                emerge --oneshot --nodeps distcc || exit 1
+                USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
                 echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /etc/passwd
                 /usr/bin/distcc-config --install 2>&1 > /dev/null
                 /usr/bin/distccd 2>&1 > /dev/null

diff --git a/targets/tinderbox/tinderbox.sh b/targets/tinderbox/tinderbox.sh
index c5709138c5bfad159db4a9fa5bb55660358709ae..bb05a4889e33528da9e8710a1919f1bc46bb4fa9 100755 (executable)
--- a/targets/tinderbox/tinderbox.sh
+++ b/targets/tinderbox/tinderbox.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/tinderbox/Attic/tinderbox.sh,v 1.3 2004/02/11 03:31:55 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox.sh,v 1.4 2004/03/26 17:03:29 zhen Exp $
 
 case $1 in
 run)
@@ -23,7 +23,7 @@ run)
        then
                export FEATURES="distcc"
                export DISTCC_HOSTS="${clst_distcc_hosts}"
-               emerge --oneshot --nodeps distcc || exit 1
+               USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
                echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /etc/passwd
                /usr/bin/distcc-config --install 2>&1 > /dev/null
                /usr/bin/distccd 2>&1 > /dev/null