| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-05-09 04:19:26 +0000 (Fri, 09 May 2008) |
| 3 |
New Revision: 1409 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/support/chroot-functions.sh |
| 8 |
Log: |
| 9 |
If we don't have a distcc user, we need to reinstall distcc, even if it's been built with the right USE. This mainly affects stage1/stage2. |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-05-09 03:59:30 UTC (rev 1408) |
| 14 |
+++ trunk/ChangeLog 2008-05-09 04:19:26 UTC (rev 1409) |
| 15 |
@@ -3,6 +3,11 @@ |
| 16 |
|
| 17 |
09 May 2008; Chris Gianelloni <wolf31o2@g.o> |
| 18 |
targets/support/chroot-functions.sh: |
| 19 |
+ If we don't have a distcc user, we need to reinstall distcc, even if it's |
| 20 |
+ been built with the right USE. This mainly affects stage1/stage2. |
| 21 |
+ |
| 22 |
+ 09 May 2008; Chris Gianelloni <wolf31o2@g.o> |
| 23 |
+ targets/support/chroot-functions.sh: |
| 24 |
We need to run distcc-config --install, since we won't be installing into |
| 25 |
ROOT=/ for stage1, and we have to use --noreplace to keep from wiping any |
| 26 |
installed versions of distcc. |
| 27 |
|
| 28 |
Modified: trunk/targets/support/chroot-functions.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/support/chroot-functions.sh 2008-05-09 03:59:30 UTC (rev 1408) |
| 31 |
+++ trunk/targets/support/chroot-functions.sh 2008-05-09 04:19:26 UTC (rev 1409) |
| 32 |
@@ -73,7 +73,16 @@ |
| 33 |
export DISTCC_HOSTS="${clst_distcc_hosts}" |
| 34 |
[ -e /etc/make.conf ] && \ |
| 35 |
echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf |
| 36 |
- clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 |
| 37 |
+ # We install distcc to / on stage1, then use --noreplace, so we need to |
| 38 |
+ # have some way to check if we need to reinstall distcc without being |
| 39 |
+ # able to rely on USE, so we check for the distcc user and force a |
| 40 |
+ # reinstall if it isn't found. |
| 41 |
+ if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ] |
| 42 |
+ then |
| 43 |
+ clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1 |
| 44 |
+ else |
| 45 |
+ clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 |
| 46 |
+ fi |
| 47 |
sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf |
| 48 |
mkdir -p /etc/distcc |
| 49 |
echo "${clst_distcc_hosts}" > /etc/distcc/hosts |
| 50 |
|
| 51 |
-- |
| 52 |
gentoo-commits@l.g.o mailing list |
Archives