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 2131B1382C5 for ; Mon, 18 Jan 2021 18:24:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54C20E077F; Mon, 18 Jan 2021 18:24:08 +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 38647E077F for ; Mon, 18 Jan 2021 18:24:08 +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 26400341009 for ; Mon, 18 Jan 2021 18:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4293487 for ; Mon, 18 Jan 2021 18:24:05 +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: <1610992872.87159ab2f5c74709bfbd64db90fe9a71779fafbd.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 87159ab2f5c74709bfbd64db90fe9a71779fafbd X-VCS-Branch: wip/mattst88 Date: Mon, 18 Jan 2021 18:24:05 +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: 8726e84a-23f8-4d28-b72c-4bc05a9be06c X-Archives-Hash: a4e3a68d675a96f6906bd3939e9965ab commit: 87159ab2f5c74709bfbd64db90fe9a71779fafbd Author: Matt Turner gentoo org> AuthorDate: Sun Jan 17 23:29:05 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jan 18 18:01:12 2021 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=87159ab2 targets: Update the @changed-subslot set by default In portage commit 1789fdf2ee81 (Add @changed-subslot package set) I added this: the set of upgradable packages for which the highest visible version has a different subslot than the currently installed version. Updating the entire stage is expensive and unnecessary (since we're going to build the latest packages in stage1 and then rebuild everything in stage3). What we definitely do need to update in the original stage3 however, is any package that would trigger a subslot rebuild. For example: gcc links with libmpfr.so from dev-libs/mpfr. mpfr's SONAME changes from libmpfr.so.4 (SLOT="0/4") to libmpfr.so.6 (SLOT="0/6"). If the seed stage's dev-libs/mpfr is not updated before emerging gcc, gcc will link with libmpfr.so.4, but the latest version of dev-libs/mpfr will be built and libmpfr.so.6 included into the stage1. Since the old libmpfr.so.4 is not included in the stage1, gcc will not work, breaking subsequent stage builds. Our current options to update the seed are too large a hammer (e.g., "--update --deep --newuse @world" or "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc") and spend too much time updating seed stages for no gain beyond updating only packages for whom the subslot has changed. Bug: https://bugs.gentoo.org/739004 Signed-off-by: Matt Turner gentoo.org> targets/stage1/chroot.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index f5c68e2c..ba6bc387 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -37,6 +37,8 @@ if [ -n "${clst_update_seed}" ]; then 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