diff options
author | 2005-07-13 00:04:53 +0000 | |
---|---|---|
committer | 2005-07-13 00:04:53 +0000 | |
commit | eb522d95bbdb9474d2a63ad03537637572b637d8 (patch) | |
tree | 922fce4373aa679bd5de89459d73d54e325c58cb | |
parent | Fixing fatal error in new postconf deprecation patch. (diff) | |
download | gentoo-eb522d95bbdb9474d2a63ad03537637572b637d8.tar.gz gentoo-eb522d95bbdb9474d2a63ad03537637572b637d8.tar.bz2 gentoo-eb522d95bbdb9474d2a63ad03537637572b637d8.zip |
Updated distcc in each target to work with newer distcc versions. This is catalyst 1.1.10.4 and I really hope it is the last one.
-rw-r--r-- | src/catalyst/ChangeLog | 11 | ||||
-rw-r--r-- | src/catalyst/catalyst | 4 | ||||
-rw-r--r-- | src/catalyst/targets/embedded/embedded-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/grp/grp-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/netboot/netboot-setup.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/stage1/stage1-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/stage2/stage2-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/stage3/stage3-chroot.sh | 4 | ||||
-rw-r--r-- | src/catalyst/targets/tinderbox/tinderbox-chroot.sh | 4 |
10 files changed, 36 insertions, 11 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 9878cac19a..b34507daf6 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.100 2005/07/12 23:31:55 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.101 2005/07/13 00:04:52 wolf31o2 Exp $ + + 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst, + targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, + targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/netboot/netboot-setup.sh, targets/stage1/stage1-chroot.sh, + targets/stage2/stage2-chroot.sh, targets/stage3/stage3-chroot.sh, + targets/tinderbox/tinderbox-chroot.sh: + Updated distcc in each target to work with newer distcc versions. This is + catalyst 1.1.10.4 and I really hope it is the last one. 12 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> modules/livecd_stage2_target.py: diff --git a/src/catalyst/catalyst b/src/catalyst/catalyst index 63b23c0f89..0f8609b81c 100644 --- a/src/catalyst/catalyst +++ b/src/catalyst/catalyst @@ -1,12 +1,12 @@ #!/usr/bin/python # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.25 2005/07/12 21:34:20 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.26 2005/07/13 00:04:53 wolf31o2 Exp $ import os,sys,imp,string,getopt __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>" -__version__="1.1.10.3" +__version__="1.1.10.4" conf_values={} diff --git a/src/catalyst/targets/embedded/embedded-chroot.sh b/src/catalyst/targets/embedded/embedded-chroot.sh index c76e74b8dc..ceb432879d 100644 --- a/src/catalyst/targets/embedded/embedded-chroot.sh +++ b/src/catalyst/targets/embedded/embedded-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/embedded/Attic/embedded-chroot.sh,v 1.13.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/Attic/embedded-chroot.sh,v 1.13.2.2 2005/07/13 00:04:53 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -29,6 +29,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gtk -gnome" emerge --oneshot --nodeps -b -k distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi if [ -n "${clst_PKGCACHE}" ] diff --git a/src/catalyst/targets/grp/grp-chroot.sh b/src/catalyst/targets/grp/grp-chroot.sh index f3c0877910..23dccb596e 100644 --- a/src/catalyst/targets/grp/grp-chroot.sh +++ b/src/catalyst/targets/grp/grp-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/grp/Attic/grp-chroot.sh,v 1.14.2.4 2005/07/07 19:57:29 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp-chroot.sh,v 1.14.2.5 2005/07/13 00:04:53 wolf31o2 Exp $ # check portage version in seed stage portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ @@ -30,6 +30,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi # setup the environment diff --git a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh b/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh index adf309c82a..9bc4ed4827 100644 --- a/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/src/catalyst/targets/livecd-stage1/livecd-stage1-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/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.15.2.2 2005/07/07 21:23:11 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1-chroot.sh,v 1.15.2.3 2005/07/13 00:04:53 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -29,6 +29,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi if [ -n "${clst_PKGCACHE}" ] diff --git a/src/catalyst/targets/netboot/netboot-setup.sh b/src/catalyst/targets/netboot/netboot-setup.sh index ac3cff40d8..aaf4d8b621 100644 --- a/src/catalyst/targets/netboot/netboot-setup.sh +++ b/src/catalyst/targets/netboot/netboot-setup.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/netboot/Attic/netboot-setup.sh,v 1.1.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-setup.sh,v 1.1.2.2 2005/07/13 00:04:53 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -16,6 +16,8 @@ fi if [ -n "${clst_DISTCC}" ] then USE="-gtk -gnome" emerge -b -k --oneshot --nodeps distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi mkdir -p ${IMAGE_PATH} diff --git a/src/catalyst/targets/stage1/stage1-chroot.sh b/src/catalyst/targets/stage1/stage1-chroot.sh index ee70eb1d0e..fa94ce7cf3 100644 --- a/src/catalyst/targets/stage1/stage1-chroot.sh +++ b/src/catalyst/targets/stage1/stage1-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/Attic/stage1-chroot.sh,v 1.29.2.7 2005/07/08 15:07:12 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-chroot.sh,v 1.29.2.8 2005/07/13 00:04:53 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -40,6 +40,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gtk -gnome" emerge --oneshot --nodeps -b -k distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi if [ -n "${clst_PKGCACHE}" ] diff --git a/src/catalyst/targets/stage2/stage2-chroot.sh b/src/catalyst/targets/stage2/stage2-chroot.sh index 49586aa882..e113588de7 100644 --- a/src/catalyst/targets/stage2/stage2-chroot.sh +++ b/src/catalyst/targets/stage2/stage2-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/Attic/stage2-chroot.sh,v 1.10.2.4 2005/07/07 16:59:50 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-chroot.sh,v 1.10.2.5 2005/07/13 00:04:53 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -20,6 +20,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gnome -gtk" emerge -b -k --oneshot --nodeps distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi if [ -n "${clst_PKGCACHE}" ] diff --git a/src/catalyst/targets/stage3/stage3-chroot.sh b/src/catalyst/targets/stage3/stage3-chroot.sh index 37516bd019..6a3bac38a5 100644 --- a/src/catalyst/targets/stage3/stage3-chroot.sh +++ b/src/catalyst/targets/stage3/stage3-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/Attic/stage3-chroot.sh,v 1.17.2.5 2005/07/07 22:18:58 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-chroot.sh,v 1.17.2.6 2005/07/13 00:04:53 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -29,6 +29,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi if [ -n "${clst_PKGCACHE}" ] diff --git a/src/catalyst/targets/tinderbox/tinderbox-chroot.sh b/src/catalyst/targets/tinderbox/tinderbox-chroot.sh index b5fac3e335..0f41910f15 100644 --- a/src/catalyst/targets/tinderbox/tinderbox-chroot.sh +++ b/src/catalyst/targets/tinderbox/tinderbox-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/tinderbox/Attic/tinderbox-chroot.sh,v 1.10.2.1 2005/07/05 21:47:46 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox-chroot.sh,v 1.10.2.2 2005/07/13 00:04:53 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -20,6 +20,8 @@ then export DISTCC_HOSTS="${clst_distcc_hosts}" USE="-gnome -gtk" emerge --oneshot --nodeps -b -k distcc || exit 1 + mkdir -p /etc/distcc + echo "${clst_distcc_hosts}" > /etc/distcc/hosts fi # setup the environment |