| 1 |
From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@g.o> |
| 2 |
|
| 3 |
--- |
| 4 |
targets/stage1/stage1-chroot.sh | 5 ++++- |
| 5 |
targets/support/chroot-functions.sh | 2 +- |
| 6 |
2 files changed, 5 insertions(+), 2 deletions(-) |
| 7 |
|
| 8 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 9 |
index 3f628c2..ed83f38 100644 |
| 10 |
--- a/targets/stage1/stage1-chroot.sh |
| 11 |
+++ b/targets/stage1/stage1-chroot.sh |
| 12 |
@@ -30,12 +30,15 @@ if [ -n "${clst_update_seed}" ]; then |
| 13 |
if [ -n "${clst_update_seed_command}" ]; then |
| 14 |
clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
| 15 |
else |
| 16 |
- clst_root_path=/ run_merge "--buildpkg=n --update --deep --newuse --onlydeps gcc" |
| 17 |
+ clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" |
| 18 |
fi |
| 19 |
elif [ "${clst_update_seed}" != "no" ]; then |
| 20 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
| 21 |
exit 1 |
| 22 |
fi |
| 23 |
+ |
| 24 |
+ # reset emerge options for the target |
| 25 |
+ clst_update_seed=no setup_myemergeopts |
| 26 |
else |
| 27 |
echo "Skipping seed stage update..." |
| 28 |
fi |
| 29 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 30 |
index 35ffbaa..0705b5b 100644 |
| 31 |
--- a/targets/support/chroot-functions.sh |
| 32 |
+++ b/targets/support/chroot-functions.sh |
| 33 |
@@ -133,7 +133,7 @@ setup_myemergeopts(){ |
| 34 |
then |
| 35 |
export bootstrap_opts="${bootstrap_opts} -f" |
| 36 |
export clst_myemergeopts="${clst_myemergeopts} -f" |
| 37 |
- elif [ -n "${clst_PKGCACHE}" ] |
| 38 |
+ elif [ -n "${clst_PKGCACHE}" -a -z "${clst_update_seed}" ] |
| 39 |
then |
| 40 |
export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" |
| 41 |
export bootstrap_opts="${bootstrap_opts} -r" |
| 42 |
-- |
| 43 |
1.8.1.5 |
Archives