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 3963813933E for ; Fri, 16 Jul 2021 07:10:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75F25E0A44; Fri, 16 Jul 2021 07:10: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 5AD45E0A44 for ; Fri, 16 Jul 2021 07:10: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 F2587342A6C for ; Fri, 16 Jul 2021 07:10:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A633A7D3 for ; Fri, 16 Jul 2021 07:10:53 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1626419004.92e83b4212ec23c1ea9d6013343462b85011a6bd.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 92e83b4212ec23c1ea9d6013343462b85011a6bd X-VCS-Branch: master Date: Fri, 16 Jul 2021 07:10:53 +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: da905fca-7bb0-4553-9f86-db6e9c259600 X-Archives-Hash: e4bf09d8c622d20a83fa408e05c459e8 commit: 92e83b4212ec23c1ea9d6013343462b85011a6bd Author: Alexey Sokolov google com> AuthorDate: Mon Jun 14 15:08:57 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Jul 16 07:03:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=92e83b42 scripts/bootstrap-prefix: do stable prefix on amd64 Bug: https://bugs.gentoo.org/759424 Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 8fab4abf44..92a7facc36 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -331,6 +331,8 @@ bootstrap_setup() { echo "PORTDIR_OVERLAY=\"\${PORTDIR_OVERLAY} ${PORTDIR_OVERLAY}\"" [[ -n ${MAKE_CONF_ADDITIONAL_USE} ]] && echo "USE=\"\${USE} ${MAKE_CONF_ADDITIONAL_USE}\"" + [[ -n ${STABLE_PREFIX} ]] && \ + echo "ACCEPT_KEYWORDS=\"amd64 -~amd64\"" [[ ${OFFLINE_MODE} ]] && \ echo 'FETCHCOMMAND="bash -c \"echo I need \${FILE} from \${URI} in \${DISTDIR}; read\""' } > "${ROOT}"/etc/portage/make.conf @@ -2694,6 +2696,38 @@ EOF esac fi + # The experimental support for Stable Prefix. + # When expanding this to other CHOSTs, don't forget to update + # make.conf generation in bootstrap_setup(). + # TODO: Consider at some point removing the ~ARCH override from + # profiles/features/prefix/standalone/make.defaults. + # https://bugs.gentoo.org/759424 + if is-rap ; then + if [[ "${CHOST}" == x86_64-pc-linux-gnu ]]; then + cat <