From: Chris Gianelloni Date: Sun, 6 Apr 2008 15:43:24 +0000 (+0000) Subject: Change back to using sys-apps/baselayout. We'll need to come up with a better perman... X-Git-Tag: CATALYST_2_0_6_916~106 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=14c6848f24645e99f2b7ca0de928039543ebc1a6;p=catalyst.git Change back to using sys-apps/baselayout. We'll need to come up with a better permanent solution now that virtual/baselayout is no more. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1388 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 9a11972e..14c4e61d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Apr 2008; Chris Gianelloni + targets/stage1/stage1-chroot.sh: + Change back to using sys-apps/baselayout. We'll need to come up with a + better permanent solution now that virtual/baselayout is no more. + 05 Apr 2008; Andrew Gaffney -livecd/cdtar/grub-memtest86+-cdtar.tar.bz2: Update the grub cdtar for grub-0.97-r5 and memtest86+-2.01 diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 7ed142a0..b76b8ed2 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -25,7 +25,7 @@ make_destpath /tmp/stage1root # First, we drop in a known-good baselayout [ -e /etc/make.conf ] && \ echo 'USE="${USE} -build"' >> /etc/make.conf -run_merge "--oneshot --nodeps virtual/baselayout" +run_merge "--oneshot --nodeps sys-apps/baselayout" sed -i '/USE="${USE} -build"/d' /etc/make.conf [ -e /etc/make.conf ] && \