From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85EBA1382C5 for ; Mon, 18 Jan 2021 03:49:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60900E0867; Mon, 18 Jan 2021 03:49:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 47A10E0867 for ; Mon, 18 Jan 2021 03:49:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0F2F4340E25 for ; Mon, 18 Jan 2021 03:49:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 874574A1 for ; Mon, 18 Jan 2021 03:49:54 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1610941788.5ae9e8dc9beb04587a92e9ffdb4b5f2073dca17a.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/, doc/, catalyst/targets/, targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage1.py doc/catalyst-spec.5.txt targets/stage1/chroot.sh targets/support/chroot-functions.sh X-VCS-Directories: targets/stage1/ catalyst/targets/ targets/support/ doc/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5ae9e8dc9beb04587a92e9ffdb4b5f2073dca17a X-VCS-Branch: wip/mattst88 Date: Mon, 18 Jan 2021 03:49:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 83d25170-c41c-4dd8-a974-91223b71223b X-Archives-Hash: cb204a4d58fe7e8b4c348f8a339b4b37 commit: 5ae9e8dc9beb04587a92e9ffdb4b5f2073dca17a Author: Matt Turner gentoo org> AuthorDate: Sat Jan 16 16:28:59 2021 +0000 Commit: Matt Turner gentoo 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 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)