From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QhAkx-0005C6-R1 for garchives@archives.gentoo.org; Thu, 14 Jul 2011 01:30:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE54221C080; Thu, 14 Jul 2011 01:30:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B18FF21C080 for ; Thu, 14 Jul 2011 01:30:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34E551B4084 for ; Thu, 14 Jul 2011 01:30:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8FA488003D for ; Thu, 14 Jul 2011 01:30:14 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <202e345f8b1910aa17fef4512828ffd5a94e7e15.WilliamH@gentoo> Subject: [gentoo-commits] proj/catalyst:catalyst_2 commit in: /, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: ChangeLog targets/support/chroot-functions.sh X-VCS-Directories: / targets/support/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 202e345f8b1910aa17fef4512828ffd5a94e7e15 Date: Thu, 14 Jul 2011 01:30:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 0f484c52835dc4c4b4e9db72d58bbc9d commit: 202e345f8b1910aa17fef4512828ffd5a94e7e15 Author: William Hubbs gmail com> AuthorDate: Thu Jul 14 01:29:24 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jul 14 01:29:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/catalyst.git;= a=3Dcommit;h=3D202e345f Revert "chroot-functions.sh: emerge sys-apps/shadow before distcc" This reverts commit a4968878f0bf3bf32e0c5fb0c4b6d88a0ebb8084. Shadow is now built in stage 1, so we do not need this. --- ChangeLog | 4 ---- targets/support/chroot-functions.sh | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e1b89f..b6df4d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,10 +5,6 @@ =20 26 Jun 2011; Matt Turner targets/support/chroot-functions.sh: - Emerge sys-apps/shadow before distcc - - 26 Jun 2011; Matt Turner - targets/support/chroot-functions.sh: Don't run 'distcc-config --install' =20 26 Jun 2011; Sebastian Pipping diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot= -functions.sh index 0b81e65..e739f0a 100644 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -72,19 +72,18 @@ setup_myfeatures(){ export clst_myfeatures=3D"${clst_myfeatures} distcc" export DISTCC_HOSTS=3D"${clst_distcc_hosts}" [ -e /etc/make.conf ] && \ - echo 'USE=3D"${USE} -avahi -gtk -gnome -cracklib -pam"' >> /etc/make.= conf + echo 'USE=3D"${USE} -avahi -gtk -gnome"' >> /etc/make.conf # We install distcc to / on stage1, then use --noreplace, so we need t= o # 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)" !=3D "distcc" ] then - clst_root_path=3D/ run_merge --oneshot --nodeps sys-apps/shadow || ex= it 1 clst_root_path=3D/ run_merge --oneshot --nodeps sys-devel/distcc || e= xit 1 else clst_root_path=3D/ run_merge --oneshot --nodeps --noreplace sys-devel= /distcc || exit 1 fi - sed -i '/USE=3D"${USE} -avahi -gtk -gnome -cracklib -pam"/d' /etc/make= .conf + sed -i '/USE=3D"${USE} -avahi -gtk -gnome"/d' /etc/make.conf mkdir -p /etc/distcc echo "${clst_distcc_hosts}" > /etc/distcc/hosts =20