As much as I hate this, we're going to force baselayout to install first. This will...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1268 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index b5fe7d8527c421cdd1f0cf977f6f3881ec808e80..1000343dbda94c4007951a303ac2656e293eca48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-chroot.sh:
+  As much as I hate this, we're going to force baselayout to install first.
+  This will keep us from having any issues with packages that don't respect
+  multilib libdirs.
+
   02 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf:
   Reorder options in catalyst.conf so they're alphabetical.
 

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index c6398c4c0df29e6ef76ce7db72eda4c61b6b4758..18430a211f1bb95621629e043562775fbb621bd3 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -24,8 +24,11 @@ fi
 ## START BUILD
 clst_root_path=/ setup_portage
 
+run_emerge "--oneshot --nodeps virtual/baselayout"
+
 run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
 rm -f /var/lib/portage/world
 touch /var/lib/portage/world
 
 rm -f /var/log/emerge.log
+rm -rf /var/tmp/*