[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, doc/, catalyst/targets/, targets/stage1/

["Matt Turner" <mattst88@gentoo.org>]

commit:     5ae9e8dc9beb04587a92e9ffdb4b5f2073dca17a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 16:28:59 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 03:49:48 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5ae9e8dc

catalyst: Remove update_seed

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/targets/stage1.py          |  2 --
 doc/catalyst-spec.5.txt             | 10 ----------
 targets/stage1/chroot.sh            | 34 ++++++++--------------------------
 targets/support/chroot-functions.sh |  2 +-
 4 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py
index 5a154e76..f7c723ee 100644
--- a/catalyst/targets/stage1.py
+++ b/catalyst/targets/stage1.py
@@ -16,8 +16,6 @@ class stage1(StageBase):
     required_values = frozenset()
     valid_values = required_values | frozenset([
         "chost",
-        "update_seed",
-        "update_seed_command",
     ])
 
     def __init__(self, spec, addlargs):

diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index 4c1df857..47a62709 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -116,16 +116,6 @@ releases, we use a default README.txt, and this will be used on your
 CD if you do not provide one yourself.  We do not use this for the
 official releases.  This setting is supported by the livecd targets.
 
-*update_seed*::
-This is an optional setting supported by stage1 to tell catalyst if
-it should update the seed stage or not (valid values: `yes no`).
-
-*update_seed_command*::
-This is an optional command to pass to emerge for updating the seed
-stage (example: `--update dev-libs/mpfr dev-libs/mpc dev-libs/gmp`)
-If not specified, catalyst will update gcc deps.
-This setting requires enabling update_seed.
-
 Compilation
 ~~~~~~~~~~~
 

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index f5002d75..e6ace213 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -24,32 +24,14 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
 
 FEATURES="${FEATURES} nodoc noman noinfo"
 
-# We need to ensure the base stage3 has USE="bindist"
-# if BINDIST is set to avoid issues with openssl / openssh
-[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}
-
-# Update stage3
-if [ -n "${clst_update_seed}" ]; then
-	if [ "${clst_update_seed}" == "yes" ]; then
-		echo "Updating seed stage..."
-		if [ -n "${clst_update_seed_command}" ]; then
-			ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}"
-		else
-			ROOT=/ run_merge --buildpkg=n --ignore-built-slot-operator-deps y @changed-subslot
-		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_emerge_opts
-else
-	echo "Skipping seed stage update..."
-fi
-
-# Clear USE
-[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf}
+# Update seed stage
+echo "Updating seed stage"
+(
+	# Don't build or use binpkgs
+	clst_PKGCACHE= setup_emerge_opts
+
+	ROOT=/ run_merge --buildpkg n --ignore-built-slot-operator-deps y @changed-subslot
+)
 
 export ROOT="${clst_root_path}"
 mkdir -p "$ROOT"

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 88465c31..94d7c938 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -136,7 +136,7 @@ setup_emerge_opts() {
 		emerge_opts+=(--load-average "${clst_load_average}")
 	fi
 
-	if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
+	if [ -n "${clst_PKGCACHE}" ]
 	then
 		emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse)
 		bootstrap_opts+=(-r)