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 7182E138334 for ; Tue, 5 Jun 2018 17:56:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 430ECE09EF; Tue, 5 Jun 2018 17:56:18 +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 173F6E09EF for ; Tue, 5 Jun 2018 17:56:18 +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 05542335C7E for ; Tue, 5 Jun 2018 17:56:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A07933E for ; Tue, 5 Jun 2018 17:56:14 +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: <1528221256.0cddd6015439d681bb07ad653de3515f5a66ae9f.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: 0cddd6015439d681bb07ad653de3515f5a66ae9f X-VCS-Branch: master Date: Tue, 5 Jun 2018 17:56:14 +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-Archives-Salt: f8f21020-e033-4240-a385-90c3c8349de7 X-Archives-Hash: 0035175cf480b36b7e1b3c555a0de055 commit: 0cddd6015439d681bb07ad653de3515f5a66ae9f Author: Fabian Groffen gentoo org> AuthorDate: Tue Jun 5 17:54:16 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jun 5 17:54:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0cddd601 scripts/bootstrap-prefix: ensure we pickup portage right after being emerged The portage in tmp may not work well with newer python, so ensure that we don't run that portage anymore once we installed a proper one. scripts/bootstrap-prefix.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 75eaf07356..910483897c 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1791,18 +1791,19 @@ bootstrap_stage3() { TIME_T_32_BIT_OK=yes \ emerge_pkgs "" "${pkgs[@]}" || return 1 + if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then + echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > "${ROOT}"/sbin/openrc-run + chmod +x "${ROOT}"/sbin/openrc-run + fi + # gettext pulls in portage, which since 2.2.28 needs ssl enabled, so # we need to lift our mask for that. pkgs=( - $( [[ ${OFFLINE_MODE} ]] || echo sys-devel/gettext ) - $( [[ ${OFFLINE_MODE} ]] || echo net-misc/wget ) virtual/os-headers - sys-apps/portage + $( [[ ${OFFLINE_MODE} ]] \ + && echo sys-apps/portage \ + || echo sys-devel/gettext ) ) - if [[ ! -x "${ROOT}"/sbin/openrc-run ]]; then - echo "We need openrc-run at ${ROOT}/sbin to merge rsync." > "${ROOT}"/sbin/openrc-run - chmod +x "${ROOT}"/sbin/openrc-run - fi USE="ssl" \ emerge_pkgs "" "${pkgs[@]}" || return 1