public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-catalyst] [PATCH 1/2] Fix update_seed use by not using nor building binary packages during the seed update.
@ 2013-03-27  3:09 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  2013-03-27  3:09 ` [gentoo-catalyst] [PATCH 2/2] Fix bugs 407051 and 458536 by using FEATURES="preserve-libs" on the unmerge step of livecd-stage2 target Jorge Manuel B. S. Vicetto (jmbsvicetto)
                   ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2013-03-27  3:09 UTC (permalink / raw
  To: gentoo-catalyst; +Cc: Jorge Manuel B. S. Vicetto (jmbsvicetto)

From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>

---
 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"
-- 
1.8.1.5



^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2013-05-28 19:54 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-27  3:09 [gentoo-catalyst] [PATCH 1/2] Fix update_seed use by not using nor building binary packages during the seed update Jorge Manuel B. S. Vicetto (jmbsvicetto)
2013-03-27  3:09 ` [gentoo-catalyst] [PATCH 2/2] Fix bugs 407051 and 458536 by using FEATURES="preserve-libs" on the unmerge step of livecd-stage2 target Jorge Manuel B. S. Vicetto (jmbsvicetto)
2013-03-27 16:09   ` Rick "Zero_Chaos" Farina
2013-03-27 12:14 ` [gentoo-catalyst] [PATCH 1/2] Fix update_seed use by not using nor building binary packages during the seed update W. Trevor King
2013-05-28  4:34 ` Rick "Zero_Chaos" Farina
2013-05-28 16:42   ` Brian Dolbec
2013-05-28 16:52     ` Rick "Zero_Chaos" Farina
2013-05-28 17:59       ` Brian Dolbec
2013-05-28 18:50         ` Rick "Zero_Chaos" Farina
2013-05-28 19:33           ` Brian Dolbec
2013-05-28 19:54             ` Rick "Zero_Chaos" Farina

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox