Change back to using sys-apps/baselayout. We'll need to come up with a better perman...

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 9a11972e5810135fcc0087a4677ab3eec541072b..14c4e61d40a384b1d6c5fce62f689ed76e588de5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 7ed142a07e6be6c778c04fa49beb59760b4f0484..b76b8ed2f0203d98f7c4301a4f918fc096b69c92 100755 (executable)
--- 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 ] && \