diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2008-04-06 15:43:24 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2008-04-06 15:43:24 +0000 |
| commit | 14c6848f24645e99f2b7ca0de928039543ebc1a6 (patch) | |
| tree | 756a9cf28c0d1b6247d71685fa665d22a8318d61 | |
| parent | Update the grub cdtar for grub-0.97-r5 and memtest86+-2.01 (diff) | |
| download | catalyst-14c6848f24645e99f2b7ca0de928039543ebc1a6.tar.gz catalyst-14c6848f24645e99f2b7ca0de928039543ebc1a6.tar.bz2 catalyst-14c6848f24645e99f2b7ca0de928039543ebc1a6.zip | |
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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | targets/stage1/stage1-chroot.sh | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 06 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org> + 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 <agaffney@gentoo.org> -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 ] && \ |