From: Chris Gianelloni Date: Fri, 9 May 2008 04:19:26 +0000 (+0000) Subject: If we don't have a distcc user, we need to reinstall distcc, even if it's been built... X-Git-Tag: CATALYST_2_0_6_916~85 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea0045a65a1fade5763ea9e63c3fdc1dbeaeb6bc;p=catalyst.git 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1409 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 2aee3746..0a1d368e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 09 May 2008; Chris Gianelloni + targets/support/chroot-functions.sh: + 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. + 09 May 2008; Chris Gianelloni targets/support/chroot-functions.sh: We need to run distcc-config --install, since we won't be installing into diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index a11617e0..f91f53cd 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -73,7 +73,16 @@ setup_myfeatures(){ export DISTCC_HOSTS="${clst_distcc_hosts}" [ -e /etc/make.conf ] && \ echo 'USE="${USE} -avahi -gtk -gnome"' >> /etc/make.conf - clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 + # We install distcc to / on stage1, then use --noreplace, so we need to + # have some way to check if we need to reinstall distcc without being + # able to rely on USE, so we check for the distcc user and force a + # reinstall if it isn't found. + if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ] + then + clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1 + else + clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1 + fi sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf mkdir -p /etc/distcc echo "${clst_distcc_hosts}" > /etc/distcc/hosts