bugfix for #66083 which in turn addresses #61605
authorJohn P. Davis <zhen@gentoo.org>
Tue, 5 Oct 2004 13:22:07 +0000 (13:22 +0000)
committerJohn P. Davis <zhen@gentoo.org>
Tue, 5 Oct 2004 13:22:07 +0000 (13:22 +0000)
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@445 d1e1f19c-881f-0410-ab34-b69fee027534

ChangeLog
modules/generic_stage_target.py
targets/embedded/embedded-chroot.sh
targets/grp/grp-chroot.sh
targets/livecd-stage1/livecd-stage1-chroot.sh
targets/stage1/stage1-chroot.sh
targets/stage2/stage2-chroot.sh
targets/stage3/stage3-chroot.sh
targets/tinderbox/tinderbox-chroot.sh

index d99b75605602d33cfd765997a17e755cb571ee16..32a03b14e86e048ac5c4e30e7728dbcf76782884 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2004/10/04 13:10:32 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.88 2004/10/05 13:22:06 zhen Exp $
+
+  05 Oct 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py,
+  targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh,
+  targets/stage3/stage3-chroot.sh, targets/tinderbox/tinderbox-chroot.sh:
+  bugfix for #66083 which in turn addresses #61605. distcc apparently does not
+  have to start a server on the build host for it to distribute.
 
   04 Oct 2004; John Davis <zhen@gentoo.org> catalyst:
   added a new -s/ --snapshot option. no more using --cli to create snapshots,
index daf6ee167c2ba711010ca527590db97e6603f9c3..b2ed52b3ec8aba9b836437ec49638f9dcf209433 100644 (file)
@@ -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/generic_stage_target.py,v 1.13 2004/10/01 02:48:08 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.14 2004/10/05 13:22:06 zhen Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -321,12 +321,6 @@ class generic_stage_target(generic_target):
                        myf.write('CXXFLAGS="${CFLAGS}"\n')
                myf.close()
 
-               #create entry in /etc/passwd for distcc user
-               if self.settings.has_key("DISTCC"): 
-                       myf=open(self.settings["chroot_path"]+"/etc/passwd","a")
-                       myf.write("distcc:x:7980:2:distccd:/dev/null:/bin/false\n")
-                       myf.close()
-               
        def clean(self):
                destpath=self.settings["chroot_path"]
                
@@ -348,17 +342,6 @@ class generic_stage_target(generic_target):
                        "/"+self.settings["target"]+".sh clean","clean script failed.")
        
        def preclean(self):
-               # cleanup after distcc
-               if self.settings.has_key("DISTCC"):
-                       myf=open(self.settings["chroot_path"]+"/etc/passwd","r")
-                       outf=open(self.settings["chroot_path"]+"/tmp/out.txt","w")
-                       for line in myf:
-                               if not line.startswith("distcc:"):
-                                       outf.write(line)
-                       myf.close()
-                       outf.close()
-                       os.rename(self.settings["chroot_path"]+"/tmp/out.txt",self.settings["chroot_path"]+"/etc/passwd")
-                                               
                try:
                        cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+\
                                "/"+self.settings["target"]+".sh preclean","preclean script failed.")
@@ -437,10 +420,6 @@ class generic_stage_target(generic_target):
                # unbind everything here so that we can clean()
                self.unbind()
                
-               # kill distcc processes outside of the chroot
-               if self.settings.has_key("DISTCC"): 
-                       cmd("/usr/bin/pkill -U 7980","could not kill distcc process(es)")
-
                if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage1","livecd-stage2"]:
                        # clean is for removing things after bind-mounts are 
                        # unmounted (general file removal and cleanup)
index 27ff10b519f6a27f5610c7f99b0a1ba6cfae5abe..fb4bd80087761775bde73a7e04901010b926f034 100755 (executable)
@@ -1,15 +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/embedded/embedded-chroot.sh,v 1.7 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.8 2004/10/05 13:22:06 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ -f /tmp/envscript ]
-then
-       source /tmp/envscript
-fi
+[ -f /tmp/envscript ] && source /tmp/envscript
 
 if [ -n "${clst_CCACHE}" ]
 then
@@ -23,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gtk -gnome" emerge --oneshot --nodeps -b -k distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
 
 if [ -n "${clst_PKGCACHE}" ]
index 1c6fa9c88a509fc4790a37dd0ec1ac04a01021a7..59c1578d923d0d779538f97c2e36b592e3ae09a3 100755 (executable)
@@ -1,15 +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.7 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.8 2004/10/05 13:22:06 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ -f /tmp/envscript ]
-then
-       source /tmp/envscript
-fi
+[ -f /tmp/envscript ] && source /tmp/envscript
 
 if [ -n "${clst_CCACHE}" ]
 then
@@ -23,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
 
 # setup the environment
index d3afc9b9f514d6f7163a39d8577fdda14498f4e9..a4be0addd342357a34d4bf84987ff7de67a7d62b 100755 (executable)
@@ -1,16 +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/livecd-stage1/livecd-stage1-chroot.sh,v 1.6 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.7 2004/10/05 13:22:06 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ -f /tmp/envscript ]
-then
-       source /tmp/envscript
-       rm -f /tmp/envscript
-fi
+[ -f /tmp/envscript ] && source /tmp/envscript
 
 if [ -n "${clst_CCACHE}" ]
 then
@@ -24,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
 
 if [ -n "${clst_PKGCACHE}" ]
index ef4ffead8ced0eea0792ec57b4df2b043dc12802..0b64d1a48b1a78db17fcbb8c3a4e0dca5394abe2 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.21 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.22 2004/10/05 13:22:06 zhen Exp $
                
 /usr/sbin/env-update
 source /etc/profile
@@ -20,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gtk -gnome" emerge --oneshot --nodeps -b -k distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
 
 if [ -n "${clst_PKGCACHE}" ]
index b1c7975d68f627ffadd4d7bc39eba8f5d6b86250..64237db79202814a54f495b3f3bb560976f777d8 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # 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/stage2-chroot.sh,v 1.6 2004/09/29 06:44:26 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.7 2004/10/05 13:22:07 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -20,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge -b -k --oneshot --nodeps distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
                                                                                
 if [ -n "${clst_PKGCACHE}" ]
index d388a092c955bf710147b0dc57fe4bfb336b2004..7949ef7d605df7b0b5cc8ef759752d4531febd76 100755 (executable)
@@ -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.9 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.10 2004/10/05 13:22:07 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -20,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
 
 if [ -n "${clst_PKGCACHE}" ]
index 7cd6f04790ea48915b75c6d0677b4a7bd7a72bd8..66040478a7fcc2c93c41e3d8631ced5515a2448d 100755 (executable)
@@ -1,16 +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/tinderbox-chroot.sh,v 1.6 2004/09/08 15:58:12 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.7 2004/10/05 13:22:07 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ -f /tmp/envscript ]
-then
-       source /tmp/envscript
-       rm -f /tmp/envscript
-fi
+[ -f /tmp/envscript ] && source /tmp/envscript
 
 if [ -n "${clst_CCACHE}" ]
 then
@@ -24,8 +20,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1
-       /usr/bin/distcc-config --install 2>&1 > /dev/null
-       /usr/bin/distccd 2>&1 > /dev/null
 fi
 
 # setup the environment