From 2564c07d2ccdf96334708b811b1958745e4154d7 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Sat, 2 Feb 2008 18:42:57 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1268 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ targets/stage1/stage1-chroot.sh | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index b5fe7d85..1000343d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 02 Feb 2008; Chris Gianelloni + 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 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 c6398c4c..18430a21 100755 --- 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/* -- 2.26.2