commit: d0cd8017d52eaacb7142a58a7fba9f0a1f320714
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 1 22:10:38 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Sep 11 02:07:04 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d0cd8017
setup_pkgmgr(): Make the 'build' use flag passed in
The "build" USE flag is only needed for the stage1 build.
It also causes other errors in later stages.
This makes setup_pkgmgr() takes an optional USE flag string
parameter to be added to the USE variable.
---
targets/stage1/stage1-chroot.sh | 2 +-
targets/support/chroot-functions.sh | 12 +++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index ed83f38..eccbd3f 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -21,7 +21,7 @@ then
fi
## Setup seed pkgmgr to ensure latest
-clst_root_path=/ setup_pkgmgr
+clst_root_path=/ setup_pkgmgr "build"
# Update stage3
if [ -n "${clst_update_seed}" ]; then
diff --git a/targets/support/chroot-functions.sh
b/targets/support/chroot-functions.sh
index a31e8bf..ee820ed 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -170,9 +170,15 @@ setup_pkgmgr(){
# portage to avoid frying our /etc/portage/make.conf file. Otherwise,
we could
# just let emerge @system could merge it.
# Use --update or portage might just waste time/cycles and reinstall
the same version.
- [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >>
/etc/portage/make.conf
- run_merge --oneshot --update sys-apps/portage
- sed -i '/USE="${USE} build"/d' /etc/portage/make.conf
+ if [ -n "$1" ];then
+ echo "Adding USE='${USE} $1' to make.conf for portage build"
+ [ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >>
/etc/portage/make.conf
+ run_merge --oneshot --update sys-apps/portage
+ sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
+ else
+ echo "Updating portage with USE='${USE}'"
+ run_merge --oneshot --update sys-apps/portage
+ fi
}
cleanup_distcc() {
