From: W. Trevor King <wking@tremily.us>
Date: Tue, 16 Apr 2013 01:26:21 +0000 (-0400)
Subject: Revert "don't build packages during update_seed"
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=refs%2Fheads%2Fbinpkg-blacklist;p=catalyst.git

Revert "don't build packages during update_seed"

This reverts commit e7ea409acb52b43e9ea141c57201f9f87673f7ba.

This is a different approach to the same binpkg ABI compatibility
problem that I address in 1ad133e (spec: Add binpkg_blacklist option
for troublesome packages, 2013-04-15).  We only need to have one
approach, and I think binpkg_blacklist is cleaner.
---

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 3f628c22..462ea283 100644
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -28,9 +28,9 @@ if [ -n "${clst_update_seed}" ]; then
 	if [ "${clst_update_seed}" == "yes" ]; then
 		echo "Updating seed stage..."
 		if [ -n "${clst_update_seed_command}" ]; then
-			clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
+			clst_root_path=/ run_merge "${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 --onlydeps gcc"
 		fi
 	elif [ "${clst_update_seed}" != "no" ]; then
 		echo "Invalid setting for update_seed: ${clst_update_seed}"