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 1D47D1382C5 for ; Mon, 18 Jan 2021 20:22:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66D40E086B; Mon, 18 Jan 2021 20:22:19 +0000 (UTC) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (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 5DDBAE086B for ; Mon, 18 Jan 2021 20:22:19 +0000 (UTC) Received: by mail-qk1-f172.google.com with SMTP id w79so19852516qkb.5 for ; Mon, 18 Jan 2021 12:22:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Cj49l3BwQSi1ffThV+/Upte2Q4ja0PZJ/svG6P/4+hQ=; b=PImqREl8Ytxqk/uTvQa6+K9G4fcvkcyzPwDMTv7dUwCP77rIC7WBqyOzP2L0iC7H+4 OYP5TH0NxSZ57kT6U55SEbmCyEKTybrW1qh3dO9RTj6J+WEJsxkSW4puIOH472ee30NK Ph4r1Ouu5oYLsi3Ey6a/Lv2g4r9X1+kWTnB+lBZrckfmb1z8MKMcYDw0RqjlQT7Dk+vt dpseiwpah6nwOuk+9F+K/yzg4xkKHKTgENca6dwUDYGnjNa9lJVYCXf6JC1rf77njIOq Nv26b5f4lu7ORGToMLs8KlGrNBaFLMzMkm3LGSs+c8TuRPmYcrx3HgK5Z6Ap1Ihnvfy9 TLdw== X-Gm-Message-State: AOAM530breGttGXAsEHV9le4iQGBxTsi/mgugHshnGeTGjuFOIF3XljW zc0DNjFvakq9LlFzO3UmMf75aHJCzdY= X-Google-Smtp-Source: ABdhPJzNoTXm2GvTt/VybAGzTNjXCMUbcwrKETBC/2+BR2a0GJOdqV9jnfWKNtkZ2cRbzJnuuxS6TQ== X-Received: by 2002:a37:68e:: with SMTP id 136mr1322041qkg.121.1611001338325; Mon, 18 Jan 2021 12:22:18 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id f134sm11416879qke.85.2021.01.18.12.22.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 12:22:17 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 11/11] catalyst: Remove update_seed spec option Date: Mon, 18 Jan 2021 15:21:52 -0500 Message-Id: <20210118202152.374078-11-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210118202152.374078-1-mattst88@gentoo.org> References: <20210118202152.374078-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: f481d59a-386c-4def-b47b-97131f7012ef X-Archives-Hash: ad853b83f184c737cb7aa293974e708d There should be no need for custom updates, and if there are exceptional circumstances the new --enter-chroot option can be used. Signed-off-by: Matt Turner --- catalyst/targets/stage1.py | 2 -- doc/catalyst-spec.5.txt | 10 ------- targets/stage1/chroot.sh | 43 +++++++++-------------------- targets/support/chroot-functions.sh | 2 +- 4 files changed, 14 insertions(+), 43 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 a1818425..76a30941 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -27,37 +27,20 @@ FEATURES="${FEATURES} nodoc noman noinfo" sed -i -e 's:BINPKG_COMPRESS="bzip2":BINPKG_COMPRESS="zstd":' \ /usr/share/portage/config/make.globals -# 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..." - - ROOT=/ USE=-rsync-verify run_merge --oneshot --update sys-apps/portage - - if [ -n "${clst_update_seed_command}" ]; then - ROOT=/ run_merge --buildpkg=n "${clst_update_seed_command}" - elif grep -q '^\[changed-subslot\]' /usr/share/portage/config/sets/portage.conf; then - ROOT=/ run_merge --ignore-built-slot-operator-deps y @changed-subslot - else - ROOT=/ 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 +# Update seed stage +echo "Updating seed stage" +( + # Don't build or use binpkgs when updating the seed stage + clst_PKGCACHE= setup_emerge_opts + + export ROOT=/ + USE=-rsync-verify run_merge --oneshot --update sys-apps/portage + if grep -q '^\[changed-subslot\]' /usr/share/portage/config/sets/portage.conf; then + run_merge --ignore-built-slot-operator-deps y @changed-subslot + else + run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc 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} +) 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) -- 2.26.2