From 4672e562c655b13d721a1fec2fa6935b0adc494f Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Fri, 26 Mar 2004 17:03:29 +0000 Subject: [PATCH] misc bugfixes git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@323 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 ++++++++- livecd/runscript/default-runscript.sh | 6 +++--- modules/targets.py | 5 +++-- targets/grp/grp.sh | 4 ++-- targets/livecd-stage1/livecd-stage1.sh | 4 ++-- targets/stage1/stage1-chroot.sh | 14 +++++++------- targets/stage2/stage2.sh | 4 ++-- targets/stage3/stage3.sh | 4 ++-- targets/tinderbox/tinderbox.sh | 4 ++-- 9 files changed, 31 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40002681..30851066 100644 --- 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 + 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 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 959801cc..3c2762da 100644 --- 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 316c1f99..2907beff 100644 --- 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 801b4456..7c73a23c 100755 --- 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 f35d367e..3d015320 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.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 4bd24e54..4fe63695 100755 --- 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 125091ed..1311752b 100755 --- 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 2a3e0a3d..b01b354a 100755 --- 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 c5709138..bb05a488 100755 --- 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 -- 2.26.2