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 8d6abfe23043357147d2e199b209d8cb5a86c0bc..fdf048c239e064090eea344b367d0920cd873ef5 100644 (file)
--- 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 <wolf31o2@gentoo.org>
+  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 <wolf31o2@gentoo.org> catalyst,
   targets/support/bootloader-setup.sh:
@@ -10,11 +21,11 @@
   Fixing some spacing.  This is catalyst 2.0_rc15.
 
   16 Jan 2006; Eric Edgar <rocket@gentoo.org> targets/support/functions.sh:
-  Attempt to fix bug 117649
+  Attempt to fix bug #117649
 
   16 Jan 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:
-  fixes for bugs 119009,119041 and 118985
+  fixes for bugs #119009, #119041 and #118985
 
   13 Jan 2006; Eric Edgar <rocket@gentoo.org>
   +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 e54b913bcabb278da2843e7191b7cc2738c027b3..b40a26ee277c148c6962baeb52eccd6f9491b53e 100755 (executable)
--- 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 01954e013c73461fdd2cf406395269cab9c91d95..7b6930b623bcfcf825445b2c890933bc3bd6df44 100755 (executable)
--- 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 356ddb548de3e8e5bef8e55a7b3b8d911c350eab..441852a7ba4b46b91b83d1de3a2044adef0707cc 100755 (executable)
--- 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 c87d8a29a299b5356264c3af417d446f3ce59edc..34122236239f2dedf95c2647fd2822803297e896 100755 (executable)
--- 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 545def92f4a0730c8453eb36b503dcbbbd5188cc..fd90513eaa1dee872552089492ec7025d646a4e8 100755 (executable)
--- 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 8e99f7af4984cd2d5648b256b7f28262fa43bd07..69dc337482c258754968b931c9cf08dee8f09add 100755 (executable)
--- 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 404f4949e7df87437e58eb55dd4f472d9f189a19..8139a701e626cbc3b159f2d379eecce3eeb246af 100755 (executable)
--- 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 abf2e9365f72a426639a22916c755ab8ad8acfc1..122d5d3d77d75b64abe3a8ad6092b65498cccbec 100755 (executable)
--- 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