From: Chris Gianelloni Date: Tue, 8 Apr 2008 22:45:51 +0000 (+0000) Subject: We should likely install baselayout before anything else, including the package manag... X-Git-Tag: CATALYST_2_0_6_916~103 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70a7bed27b4253bc8a193816caa315ec09e4a66c;p=catalyst.git We should likely install baselayout before anything else, including the package manager. As such, I've moved it to after sys-apps/baselayout is installed. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1391 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index ab5145de..5d2c269a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Apr 2008; Chris Gianelloni + targets/stage1/stage1-chroot.sh: + We should likely install baselayout before anything else, including the + package manager. As such, I've moved it to after sys-apps/baselayout is + installed. + 08 Apr 2008; Chris Gianelloni targets/livecd-stage2/livecd-stage2-controller.sh: Check for a snapshot in the overlay and error if one is present. This should diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index b76b8ed2..13d40aeb 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -19,15 +19,17 @@ then fi ## START BUILD -clst_root_path=/ setup_pkgmgr -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 sys-apps/baselayout" sed -i '/USE="${USE} -build"/d' /etc/make.conf +# Next, we install the package manager +clst_root_path=/ setup_pkgmgr +make_destpath /tmp/stage1root + +# Now, we install our packages [ -e /etc/make.conf ] && \ echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \ >> /etc/make.conf