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 02066138334 for ; Tue, 25 Dec 2018 13:00:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 059B4E0819; Tue, 25 Dec 2018 13:00:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BAC5CE0819 for ; Tue, 25 Dec 2018 13:00:28 +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 BEC6C335C39 for ; Tue, 25 Dec 2018 13:00:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B0B72A7 for ; Tue, 25 Dec 2018 13:00:23 +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: <1545742804.db21e605a0f4824c6fbbe50626c28de2d375100d.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: db21e605a0f4824c6fbbe50626c28de2d375100d X-VCS-Branch: master Date: Tue, 25 Dec 2018 13:00:23 +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: 03de9998-49dc-4c01-a448-a984d59af9b5 X-Archives-Hash: 1695168cf599381b0a689baad8f1b00f commit: db21e605a0f4824c6fbbe50626c28de2d375100d Author: Fabian Groffen gentoo org> AuthorDate: Tue Dec 25 13:00:04 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Dec 25 13:00:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=db21e605 scripts/bootstrap-prefix.sh: remove recentely added cruft Instead of adding patches and workarounds, just bump bootstrap portage version. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 127 ++------------------------------------------ 1 file changed, 5 insertions(+), 122 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 48ac9628de..5440efe94a 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -611,118 +611,6 @@ prepare_portage() { mkdir -p "${ROOT}"/bin/. "${ROOT}"/var/log [[ -x ${ROOT}/bin/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1 [[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1 - - # remove me after Bug 585986 - mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage-2.3.52 - cat > "${ROOT}"/etc/portage/patches/sys-apps/portage-2.3.52/path.patch < -Date: Thu, 13 Dec 2018 16:53:16 +0800 -Subject: _doebuild_path: do not use host PATH by default and prepend EPREFIX - PATH. - - EPREFIX could be overridden in cross-eprefix, in that case tools - inside EPREFIX should be prioritized. - - Link necessary binary tools to the test environment. - -Bug: https://bugs.gentoo.org/585986 -Closes: https://github.com/gentoo/portage/pull/387 -Signed-off-by: Zac Medico ---- - lib/portage/package/ebuild/doebuild.py | 9 ++++--- - lib/portage/tests/resolver/ResolverPlayground.py | 34 ++++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 4 deletions(-) - -diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py -index 5da9c9503..47c69967c 100644 ---- a/lib/portage/package/ebuild/doebuild.py -+++ b/lib/portage/package/ebuild/doebuild.py -@@ -211,7 +211,6 @@ def _doebuild_path(settings, eapi=None): - if portage_bin_path[0] != portage.const.PORTAGE_BIN_PATH: - # Add a fallback path for restarting failed builds (bug 547086) - portage_bin_path.append(portage.const.PORTAGE_BIN_PATH) -- eprefix = portage.const.EPREFIX - prerootpath = [x for x in settings.get("PREROOTPATH", "").split(":") if x] - rootpath = [x for x in settings.get("ROOTPATH", "").split(":") if x] - rootpath_set = frozenset(rootpath) -@@ -219,9 +218,10 @@ def _doebuild_path(settings, eapi=None): - "__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x] - - prefixes = [] -- if eprefix: -- prefixes.append(eprefix) -- prefixes.append("/") -+ # settings["EPREFIX"] should take priority over portage.const.EPREFIX -+ if portage.const.EPREFIX != settings["EPREFIX"] and settings["ROOT"] == os.sep: -+ prefixes.append(settings["EPREFIX"]) -+ prefixes.append(portage.const.EPREFIX) - - path = overrides - -@@ -245,6 +245,7 @@ def _doebuild_path(settings, eapi=None): - path.extend(prerootpath) - - for prefix in prefixes: -+ prefix = prefix if prefix else "/" - for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"): - # Respect order defined in ROOTPATH - x_abs = os.path.join(prefix, x) -diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py -index e2e061669..3997ad26e 100644 ---- a/lib/portage/tests/resolver/ResolverPlayground.py -+++ b/lib/portage/tests/resolver/ResolverPlayground.py -@@ -10,6 +10,7 @@ from portage import os - from portage import shutil - from portage.const import (GLOBAL_CONFIG_PATH, PORTAGE_BASE_PATH, - USER_CONFIG_PATH) -+from portage.process import find_binary - from portage.dep import Atom, _repo_separator - from portage.package.ebuild.config import config - from portage.package.ebuild.digestgen import digestgen -@@ -76,6 +77,39 @@ class ResolverPlayground(object): - self.debug = debug - if eprefix is None: - self.eprefix = normalize_path(tempfile.mkdtemp()) -+ -+ # EPREFIX/bin is used by fake true_binaries. Real binaries goes into EPREFIX/usr/bin -+ eubin = os.path.join(self.eprefix, "usr", "bin") -+ ensure_dirs(eubin) -+ essential_binaries = ( -+ "awk", -+ "basename", -+ "bzip2", -+ "cat", -+ "chmod", -+ "chown", -+ "cp", -+ "egrep", -+ "env", -+ "find", -+ "grep", -+ "head", -+ "install", -+ "ln", -+ "mkdir", -+ "mktemp", -+ "mv", -+ "rm", -+ "sed", -+ "sort", -+ "tar", -+ "tr", -+ "uname", -+ "uniq", -+ "xargs", -+ ) -+ for x in essential_binaries: -+ os.symlink(find_binary(x), os.path.join(eubin, x)) - else: - self.eprefix = normalize_path(eprefix) - --- -cgit v1.2.1 -EOP } bootstrap_portage() { @@ -730,8 +618,8 @@ bootstrap_portage() { # STABLE_PV that is known to work. Intended for power users only. ## It is critical that STABLE_PV is the lastest (non-masked) version that is ## included in the snapshot for bootstrap_tree. - STABLE_PV="2.3.40.3" - [[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.3" + STABLE_PV="2.3.52.2" + [[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.52.2" PV="${TESTING_PV:-${STABLE_PV}}" A=prefix-portage-${PV}.tar.bz2 einfo "Bootstrapping ${A%-*}" @@ -748,14 +636,9 @@ bootstrap_portage() { S="${S}/prefix-portage-${PV}" cd "${S}" - # https://github.com/gentoo/portage/pull/389 - sed -e 's,\${PORTAGE_OVERRIDE_EPREFIX}/usr/lib\*/portage/\*,\*/portage/\*/ebuild-helpers\*,' \ - -i bin/ebuild-helpers/portageq || \ - return 1 - # disable ipc sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ - -i pym/_emerge/AbstractEbuildProcess.py || \ + -i lib/_emerge/AbstractEbuildProcess.py || \ return 1 # host-provided wget may lack certificates, stage1 wget is without ssl @@ -796,8 +679,8 @@ bootstrap_portage() { [[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage for d in "${ROOT}"/tmp/usr/lib/python?.?; do - [[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/pym/portage ${d}/portage - [[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/pym/_emerge ${d}/_emerge + [[ -e ${d}/portage ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/portage ${d}/portage + [[ -e ${d}/_emerge ]] || ln -s "${ROOT}"/tmp/usr/lib/portage/lib/_emerge ${d}/_emerge done if [[ -s ${PORTDIR}/profiles/repo_name ]]; then