From: John P. Davis <zhen@gentoo.org>
Date: Wed, 14 Apr 2004 14:27:38 +0000 (+0000)
Subject: updating grp targets
X-Git-Tag: CATALYST_2_0_6_916~1017
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d533a43782cabc6cdbcc2453f23740535b33222;p=catalyst.git

updating grp targets


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

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 2f3ba15c..b6e51d79 100755
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,12 +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/grp/grp-chroot.sh,v 1.1 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.2 2004/04/14 14:27:38 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ -n "${clst_ENVSCRIPT}" ]
+if [ -f /tmp/envscript ]
 then
 	source /tmp/envscript
 	rm -f /tmp/envscript
@@ -24,7 +24,7 @@ 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
+	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
@@ -35,8 +35,8 @@ export CONFIG_PROTECT="-*"
 
 ## START BUILD
 USE="build" emerge portage
-#turn off auto-use:
 
+#turn off auto-use:
 export USE_ORDER="env:conf:defaults"
 	
 if [ "${clst_grp_type}" = "pkgset" ]
diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index 99be76c3..48943530 100755
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
@@ -1,13 +1,13 @@
 #!/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/grp-preclean-chroot.sh,v 1.1 2004/04/12 14:38:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.2 2004/04/14 14:27:38 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
 if [ -n "${clst_DISTCC}" ]
 then
-	killall -9 distccd
+	pkill -signal 9 -U 7980
 	userdel distcc || exit 1
 fi
diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index 89363672..be0d7659 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.14 2004/04/14 00:17:59 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.15 2004/04/14 14:27:38 zhen Exp $
 
 case $1 in
 	enter)
@@ -15,18 +15,23 @@ case $1 in
 		shift
 				
 		cp ${clst_sharedir}/targets/grp/grp-chroot.sh ${clst_chroot_path}/tmp
+		
 		clst_grp_packages="$*" ${clst_CHROOT} ${clst_chroot_path} /tmp/grp-chroot.sh
+		[ $? -ne 0 ] && exit 1
+
 		rm -f ${clst_chroot_path}/tmp/grp-chroot.sh
  
-		[ $? -ne 0 ] && exit 1
-	;;
+			;;
 
 	preclean)
 		cp ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh ${clst_chroot_path}/tmp
-        ${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh
-        rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
-
+        
+		${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh
         [ $? -ne 0 ] && exit 1
+		
+		rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
+
+        
 	;;
 
 	clean)