From: John P. Davis <zhen@gentoo.org>
Date: Wed, 14 Apr 2004 00:17:59 +0000 (+0000)
Subject: distcc cleanups
X-Git-Tag: CATALYST_2_0_6_916~1022
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=783849572b1da51a9cdf6b2c34b0c269cd4ec93e;p=catalyst.git

distcc cleanups


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

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 16112308..e39a4c69 100755
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,17 +1,11 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.1 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.2 2004/04/14 00:17:59 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ -n "${clst_ENVSCRIPT}" ]
-then
-	source /tmp/envscript
-	rm -f /tmp/envscript
-fi
-
 if [ -n "${clst_CCACHE}" ]
 then
 	export clst_myfeatures="${clst_myfeatures} ccache"
diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index ff506c03..89363672 100755
--- a/targets/grp/grp.sh
+++ b/targets/grp/grp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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.13 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.14 2004/04/14 00:17:59 zhen Exp $
 
 case $1 in
 	enter)
@@ -14,11 +14,6 @@ case $1 in
 		export clst_grp_target=$1
 		shift
 				
-		if [ -n "${clst_ENVSCRIPT}" ]
-		then
-			cp ${clst_ENVSCRIPT} ${clst_chroot_path}/tmp/envscript
-		fi
- 
 		cp ${clst_sharedir}/targets/grp/grp-chroot.sh ${clst_chroot_path}/tmp
 		clst_grp_packages="$*" ${clst_CHROOT} ${clst_chroot_path} /tmp/grp-chroot.sh
 		rm -f ${clst_chroot_path}/tmp/grp-chroot.sh
diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh
index feecc217..3aabbfff 100755
--- a/targets/livecd-stage1/livecd-stage1.sh
+++ b/targets/livecd-stage1/livecd-stage1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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.9 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.10 2004/04/14 00:17:59 zhen Exp $
 
 case $1 in
 	enter)
@@ -10,11 +10,6 @@ case $1 in
 	run)
 		shift
 	
-		if [ -n "${clst_ENVSCRIPT}" ]
-		then
-			cp "${clst_ENVSCRIPT}" ${clst_chroot_path}/tmp/envscript
-		fi
-
 		cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-chroot.sh ${clst_chroot_path}/tmp
 		clst_packages="$*" ${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-chroot.sh
 		rm -f ${clst_chroot_path}/tmp/livecd-stage1-chroot.sh
diff --git a/targets/stage1/stage1.sh b/targets/stage1/stage1.sh
index 93058c47..dcf4e037 100755
--- a/targets/stage1/stage1.sh
+++ b/targets/stage1/stage1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.10 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.11 2004/04/14 00:17:59 zhen Exp $
 
 case $1 in
 	enter)
@@ -9,11 +9,6 @@ case $1 in
 	;;
 
 	run)
-		if [ -n "${clst_ENVSCRIPT}" ]
-		then
-			cp "${clst_ENVSCRIPT}" ${clst_chroot_path}/tmp/envscript
-		fi	
-			
 		cp ${clst_sharedir}/targets/stage1/stage1-chroot.sh ${clst_chroot_path}/tmp
 		cp ${clst_sharedir}/targets/stage1/build.sh ${clst_chroot_path}/tmp
 		
diff --git a/targets/stage2/stage2.sh b/targets/stage2/stage2.sh
index 5a0ebf86..39712a28 100755
--- a/targets/stage2/stage2.sh
+++ b/targets/stage2/stage2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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.13 2004/04/13 20:06:41 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2.sh,v 1.14 2004/04/14 00:17:59 zhen Exp $
 
 case $1 in
 	enter)
@@ -10,11 +10,6 @@ case $1 in
 	;;
 
 	run)
-		if [ -n "${clst_ENVSCRIPT}" ]
-		then
-			cp "${clst_ENVSCRIPT}" ${clst_chroot_path}/tmp/envscript
-		fi
-
 		cp ${clst_sharedir}/targets/stage2/stage2-chroot.sh ${clst_chroot_path}/tmp
 		${clst_CHROOT} ${clst_chroot_path} /tmp/stage2-chroot.sh
 		rm -f ${clst_chroot_path}/tmp/stage2-chroot.sh
diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index c0521153..310d1c99 100755
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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/stage3-chroot.sh,v 1.1 2004/04/12 14:39:35 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.2 2004/04/14 00:17:59 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,9 @@ then
 	export DISTCC_HOSTS="${clst_distcc_hosts}"
 
 	USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
-	echo "distcc:x:240:2:distccd:/dev/null:/bin/false" >> /etc/passwd
+	cat /etc/passwd
+	sleep 10
+	echo "distcc:x:7980: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
diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index 21031c0e..220d0bd8 100755
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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/stage3-preclean-chroot.sh,v 1.1 2004/04/12 14:39:35 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-preclean-chroot.sh,v 1.2 2004/04/14 00:17:59 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -15,7 +15,7 @@ fi
 
 if [ -n "${clst_DISTCC}" ]
 then
-	killall -9 distccd
+	pkill -signal 9 -U 7980
 	emerge -C sys-devel/distcc || exit 1
 	userdel distcc || exit 1
 fi
diff --git a/targets/stage3/stage3.sh b/targets/stage3/stage3.sh
index c1e84c47..4d6eb537 100755
--- a/targets/stage3/stage3.sh
+++ b/targets/stage3/stage3.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # 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.13 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3.sh,v 1.14 2004/04/14 00:17:59 zhen Exp $
 
 case $1 in
 	enter)
@@ -9,11 +9,6 @@ case $1 in
 	;;
 
 	run)
-		if [ -n "${clst_ENVSCRIPT}" ]
-		then
-			cp "${clstr_ENVSCRIPT}" ${clst_chroot_path}/tmp/envscript
-		fi
-
 		cp ${clst_sharedir}/targets/stage3/stage3-chroot.sh ${clst_chroot_path}/tmp	
 		${clst_CHROOT} ${clst_chroot_path} /tmp/stage3-chroot.sh
 		rm -f ${clst_chroot_path}/tmp/stage3-chroot.sh
diff --git a/targets/tinderbox/tinderbox.sh b/targets/tinderbox/tinderbox.sh
index 7cfda32f..0a65965d 100755
--- a/targets/tinderbox/tinderbox.sh
+++ b/targets/tinderbox/tinderbox.sh
@@ -1,17 +1,12 @@
 #!/bin/bash
 # 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.6 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox.sh,v 1.7 2004/04/14 00:17:59 zhen Exp $
 
 case $1 in
 	run)
 		shift
 
-		if [ -n "${clst_ENVSCRIPT}" ]
-		then
-			cp "${clst_ENVSCRIPT}" ${clst_chroot_path}/tmp/envscript
-		fi
-
 		cp ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh ${clst_chroot_path}/tmp
 		clst_tinderbox_packages="$*" ${clst_CHROOT} ${clst_chroot_path} /tmp/tinderbox-chroot.sh
 		rm -f ${clst_chroot_path}/tmp/tinderbox-chroot.sh