From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F2A60138010 for ; Tue, 23 Oct 2012 17:19:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C6A721C016; Tue, 23 Oct 2012 17:19:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id ED3B121C01C for ; Tue, 23 Oct 2012 17:19:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58A7D33D826 for ; Tue, 23 Oct 2012 17:19:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 025B0E5436 for ; Tue, 23 Oct 2012 17:18:59 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1351012791.694e7872695d384a170830835a1863ed1a2ebdfc.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 694e7872695d384a170830835a1863ed1a2ebdfc X-VCS-Branch: master Date: Tue, 23 Oct 2012 17:18:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cf7b16a3-712c-4ba9-99d2-ae58ac075f13 X-Archives-Hash: e97a7c04c259888d248b51069ad702e7 commit: 694e7872695d384a170830835a1863ed1a2ebdfc Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Oct 23 17:19:51 2012 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Oct 23 17:19:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=694e7872 fix order of stage1 portage updates Reorder things based on proper understanding of stage1 builds. This allows a slight reduction in redundancy. --- targets/stage1/stage1-chroot.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 6f7e5b0..a9536a6 100644 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -18,15 +18,19 @@ then exit 1 fi +## Setup seed pkgmgr to ensure latest +clst_root_path=/ setup_pkgmgr + # Update stage3 if [ -n "${clst_update_seed_cache}" ]; then echo "Updating seed stage..." - clst_root_path=/ setup_pkgmgr clst_root_path=/ run_merge "--update --deep --newuse @world" else echo "Skipping seed stage update..." fi +make_destpath /tmp/stage1root + ## START BUILD # First, we drop in a known-good baselayout [ -e /etc/portage/make.conf ] && \ @@ -35,10 +39,6 @@ run_merge "--oneshot --nodeps sys-apps/baselayout" sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf -# Next, we install the package manager -clst_root_path=/ setup_pkgmgr -make_destpath /tmp/stage1root - # Now, we install our packages [ -e /etc/portage/make.conf ] && \ echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \