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

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 3f628c22cfcb97ba45fa01b594c17b0cc465b7f8..ed83f3852f456bb195285657ef7269800a9da2c1 100644 (file)
--- 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
                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
                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
 else
        echo "Skipping seed stage update..."
 fi

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 35ffbaa558b96971719648827cb6b76807d8d58b..0705b5b63f92f35d1aaf92f835815d9d00c9edc4 100644 (file)
--- 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"
        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"
        then
                export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
                export bootstrap_opts="${bootstrap_opts} -r"