| 1 |
From: "W. Trevor King" <wking@×××××××.us> |
| 2 |
|
| 3 |
This reverts commit e7ea409acb52b43e9ea141c57201f9f87673f7ba. |
| 4 |
|
| 5 |
This is a different approach to the same binpkg ABI compatibility |
| 6 |
problem that I address in 1ad133e (spec: Add binpkg_blacklist option |
| 7 |
for troublesome packages, 2013-04-15). We only need to have one |
| 8 |
approach, and I think binpkg_blacklist is cleaner. |
| 9 |
--- |
| 10 |
targets/stage1/stage1-chroot.sh | 4 ++-- |
| 11 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 14 |
index 3f628c2..462ea28 100644 |
| 15 |
--- a/targets/stage1/stage1-chroot.sh |
| 16 |
+++ b/targets/stage1/stage1-chroot.sh |
| 17 |
@@ -28,9 +28,9 @@ if [ -n "${clst_update_seed}" ]; then |
| 18 |
if [ "${clst_update_seed}" == "yes" ]; then |
| 19 |
echo "Updating seed stage..." |
| 20 |
if [ -n "${clst_update_seed_command}" ]; then |
| 21 |
- clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
| 22 |
+ clst_root_path=/ run_merge "${clst_update_seed_command}" |
| 23 |
else |
| 24 |
- clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc" |
| 25 |
+ clst_root_path=/ run_merge "--update --deep --newuse --onlydeps gcc" |
| 26 |
fi |
| 27 |
elif [ "${clst_update_seed}" != "no" ]; then |
| 28 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
| 29 |
-- |
| 30 |
1.8.2 |
Archives