[gentoo-commits] proj/catalyst:master commit in: targets/stage1/, targets/support/

[gentoo-commits] proj/catalyst:master commit in: targets/stage1/, targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     9481a7aaa14e0859ac5501bc82880260e88add7c
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 15:59:18 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 16:02:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9481a7aa

Update catalyst targets to reflect the change from STAGE1_USE to BOOTSTRAP_USE and drop cxx from stage1 target as it was added to BOOTSTRAP_USE.

---
 targets/stage1/stage1-chroot.sh     |    6 +++---
 targets/support/chroot-functions.sh |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 550eef7..dadd0f5 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -6,7 +6,7 @@ export clst_buildpkgs="$(/tmp/build.py)"
 source /tmp/chroot-functions.sh
 
 # Setup our environment
-STAGE1_USE="$(portageq envvar STAGE1_USE)"
+BOOTSTRAP0_USE="$(portageq envvar BOOTSTRAP_USE)"
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 
 ## Sanity check profile
@@ -31,8 +31,8 @@ make_destpath /tmp/stage1root
 
 # Now, we install our packages
 [ -e /etc/make.conf ] && \
-	echo "USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"" \
+	echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
 	>> /etc/make.conf
 run_merge "--oneshot ${clst_buildpkgs}"
-sed -i "/USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
+sed -i "/USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
 	/etc/make.conf

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b19ce9a..c454aaf 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -291,7 +291,7 @@ show_debug() {
 		# `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc
 		# XXX: Also, portageq does *not* source profile.bashrc at any time.
 		echo
-		echo "STAGE1_USE:            $(portageq envvar STAGE1_USE)"
+		echo "BOOTSTRAP_USE:            $(portageq envvar BOOTSTRAP_USE)"
 		echo
 		echo "USE (profile):         $(portageq envvar USE)"
 		echo "FEATURES (profile):    $(portageq envvar FEATURES)"

[gentoo-commits] proj/catalyst:master commit in: targets/stage1/, targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     6c0a577deaf6cdfb188abe1ce2f263122eaa8935
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 03:12:18 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 17:30:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6c0a577d

Fix update_seed use by not using nor building binary packages during the seed update.

---
 targets/stage1/stage1-chroot.sh     |    5 ++++-
 targets/support/chroot-functions.sh |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 3f628c2..ed83f38 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -30,12 +30,15 @@ if [ -n "${clst_update_seed}" ]; then
 		if [ -n "${clst_update_seed_command}" ]; then
 			clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
 		else
-			clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc"
+			clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
 		fi
 	elif [ "${clst_update_seed}" != "no" ]; then
 		echo "Invalid setting for update_seed: ${clst_update_seed}"
 		exit 1
 	fi
+
+	# reset emerge options for the target
+	clst_update_seed=no setup_myemergeopts
 else
 	echo "Skipping seed stage update..."
 fi

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 35ffbaa..0705b5b 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -133,7 +133,7 @@ setup_myemergeopts(){
 	then
 		export bootstrap_opts="${bootstrap_opts} -f"
 		export clst_myemergeopts="${clst_myemergeopts} -f"
-	elif [ -n "${clst_PKGCACHE}" ]
+	elif [ -n "${clst_PKGCACHE}" -a -z "${clst_update_seed}" ]
 	then
 		export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
 		export bootstrap_opts="${bootstrap_opts} -r"

[gentoo-commits] proj/catalyst:master commit in: targets/stage1/, targets/support/

[Brian Dolbec]

commit:     2426bb1f275c56150c07f8d1097296b00def7159
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 03:05:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2426bb1f

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() {