# 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,
# 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
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"]
"/"+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.")
# 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)
#!/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
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}" ]
#!/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
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
#!/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
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}" ]
#!/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
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}" ]
#!/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
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}" ]
#!/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
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}" ]
#!/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
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