From: Chris Gianelloni Date: Tue, 17 Jan 2006 19:30:45 +0000 (+0000) Subject: Added function to cleanup stray /etc/distcc/hosts files. X-Git-Tag: CATALYST_2_0_6_916~469 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=383df9d5881160e797bb4ac15a69f30af3bbf85b;p=catalyst.git Added function to cleanup stray /etc/distcc/hosts files. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1025 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 8d6abfe2..fdf048c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.510 2006/01/16 15:45:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.511 2006/01/17 19:30:44 wolf31o2 Exp $ + + 17 Jan 2006; Chris Gianelloni + targets/embedded/embedded-preclean-chroot.sh, + targets/grp/grp-preclean-chroot.sh, + targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, + targets/stage1/stage1-preclean-chroot.sh, + targets/stage2/stage2-preclean-chroot.sh, + targets/stage3/stage3-preclean-chroot.sh, + targets/support/chroot-functions.sh, + targets/tinderbox/tinderbox-preclean-chroot.sh: + Added function to cleanup stray /etc/distcc/hosts files. 16 Jan 2006; Chris Gianelloni catalyst, targets/support/bootloader-setup.sh: @@ -10,11 +21,11 @@ Fixing some spacing. This is catalyst 2.0_rc15. 16 Jan 2006; Eric Edgar targets/support/functions.sh: - Attempt to fix bug 117649 + Attempt to fix bug #117649 16 Jan 2006; Eric Edgar modules/generic_stage_target.py: - fixes for bugs 119009,119041 and 118985 + fixes for bugs #119009, #119041 and #118985 13 Jan 2006; Eric Edgar +examples/netboot2_template.spec, modules/catalyst_support.py, diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh index e54b913b..b40a26ee 100755 --- a/targets/embedded/embedded-preclean-chroot.sh +++ b/targets/embedded/embedded-preclean-chroot.sh @@ -1,7 +1,8 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-preclean-chroot.sh,v 1.7 2005/12/16 19:08:59 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-preclean-chroot.sh,v 1.8 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh update_env_settings +cleanup_distcc diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh index 01954e01..7b6930b6 100755 --- a/targets/grp/grp-preclean-chroot.sh +++ b/targets/grp/grp-preclean-chroot.sh @@ -1,9 +1,10 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # 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.9 2005/12/16 19:14:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.10 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh update_env_settings +cleanup_distcc gconftool-2 --shutdown diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh index 356ddb54..441852a7 100755 --- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh @@ -1,7 +1,8 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.7 2005/04/04 17:48:33 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.8 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh update_env_settings +cleanup_distcc diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index c87d8a29..34122236 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-preclean-chroot.sh,v 1.9 2005/12/21 17:40:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-preclean-chroot.sh,v 1.10 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -19,3 +19,15 @@ then else echo UTC > /etc/TZ fi + +#if [ -n "${clst_CCACHE}" ] +#then +# run_emerge -C dev-util/ccache || exit 1 +#fi + +#if [ -n "${clst_DISTCC}" ] +#then +# run_emerge -C sys-devel/distcc || exit 1 +#fi + +#cleanup_distcc diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh index 545def92..fd90513e 100755 --- a/targets/stage2/stage2-preclean-chroot.sh +++ b/targets/stage2/stage2-preclean-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-preclean-chroot.sh,v 1.9 2005/12/19 15:28:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-preclean-chroot.sh,v 1.10 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -17,4 +17,6 @@ then run_emerge -C sys-devel/distcc || exit 1 fi +cleanup_distcc + rm -f /var/log/emerge.log diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh index 8e99f7af..69dc3374 100755 --- a/targets/stage3/stage3-preclean-chroot.sh +++ b/targets/stage3/stage3-preclean-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # 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.9 2005/12/19 15:28:42 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-preclean-chroot.sh,v 1.10 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -17,4 +17,6 @@ then run_emerge -C sys-devel/distcc || exit 1 fi +cleanup_distcc + rm -f /var/log/emerge.log diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 404f4949..8139a701 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -108,6 +108,10 @@ setup_binutils(){ fi } +cleanup_distcc() { + rm -rf /etc/distcc/hosts +} + update_env_settings(){ /usr/sbin/env-update source /etc/profile diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh index abf2e936..122d5d3d 100755 --- a/targets/tinderbox/tinderbox-preclean-chroot.sh +++ b/targets/tinderbox/tinderbox-preclean-chroot.sh @@ -1,8 +1,8 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.7 2005/12/19 19:10:04 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.8 2006/01/17 19:30:45 wolf31o2 Exp $ . /tmp/chroot-functions.sh - update_env_settings +cleanup_distcc