| 1 |
commit: a07b63e84557a8ad4b83776252c947c1abffccd1 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 30 18:39:43 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 30 18:39:43 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a07b63e8 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: bump snapshots, cleanup |
| 9 |
|
| 10 |
scripts/bootstrap-prefix.sh | 73 ++------------------------------------------- |
| 11 |
1 file changed, 3 insertions(+), 70 deletions(-) |
| 12 |
|
| 13 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 14 |
index 046a7918d0..07695383bf 100755 |
| 15 |
--- a/scripts/bootstrap-prefix.sh |
| 16 |
+++ b/scripts/bootstrap-prefix.sh |
| 17 |
@@ -537,7 +537,7 @@ do_tree() { |
| 18 |
bootstrap_tree() { |
| 19 |
# RAP uses the latest gentoo main repo snapshot to bootstrap. |
| 20 |
is-rap && LATEST_TREE_YES=1 |
| 21 |
- local PV="20180620" |
| 22 |
+ local PV="20180629" |
| 23 |
if [[ -n ${LATEST_TREE_YES} ]]; then |
| 24 |
do_tree "${SNAPSHOT_URL}" portage-latest.tar.bz2 |
| 25 |
else |
| 26 |
@@ -609,8 +609,8 @@ bootstrap_portage() { |
| 27 |
# STABLE_PV that is known to work. Intended for power users only. |
| 28 |
## It is critical that STABLE_PV is the lastest (non-masked) version that is |
| 29 |
## included in the snapshot for bootstrap_tree. |
| 30 |
- STABLE_PV="2.3.40.2" |
| 31 |
- [[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.2" |
| 32 |
+ STABLE_PV="2.3.40.3" |
| 33 |
+ [[ ${TESTING_PV} == latest ]] && TESTING_PV="2.3.40.3" |
| 34 |
PV="${TESTING_PV:-${STABLE_PV}}" |
| 35 |
A=prefix-portage-${PV}.tar.bz2 |
| 36 |
einfo "Bootstrapping ${A%-*}" |
| 37 |
@@ -627,73 +627,6 @@ bootstrap_portage() { |
| 38 |
S="${S}/prefix-portage-${PV}" |
| 39 |
cd "${S}" |
| 40 |
|
| 41 |
- # patch temporary included here: fail when it should be dropped |
| 42 |
- patch -p1 <<'EOP' |
| 43 |
-From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001 |
| 44 |
-From: Michael Haubenwallner <haubi@g.o> |
| 45 |
-Date: Tue, 19 Jun 2018 16:39:12 +0200 |
| 46 |
-Subject: [PATCH] introduce the 'stacked-prefix' FEATURE |
| 47 |
- |
| 48 |
-When we merge into another EPREFIX, but not into some ROOT, |
| 49 |
-and CHOST is equal to CBUILD, build tools found in EPREFIX |
| 50 |
-perfectly work for the current build environment. |
| 51 |
-In a "stacked prefix" we explicitly utilize this situation. |
| 52 |
- |
| 53 |
-This is useful during prefix bootstrap (#655414, #655326), but also to |
| 54 |
-build packages for targets unable to support the full portage toolchain |
| 55 |
-(native Windows, MinGW), but otherwise do not require a full cross |
| 56 |
-compilation setup. |
| 57 |
---- |
| 58 |
- bin/phase-helpers.sh | 14 ++++++++++++++ |
| 59 |
- pym/portage/const.py | 1 + |
| 60 |
- 2 files changed, 15 insertions(+) |
| 61 |
- |
| 62 |
-diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh |
| 63 |
-index c32533fb3..fea2362cf 100644 |
| 64 |
---- a/bin/phase-helpers.sh |
| 65 |
-+++ b/bin/phase-helpers.sh |
| 66 |
-@@ -927,6 +927,20 @@ ___best_version_and_has_version_common() { |
| 67 |
- fi ;; |
| 68 |
- esac |
| 69 |
- |
| 70 |
-+ if ___eapi_has_prefix_variables && |
| 71 |
-+ has "${root_arg}" '--host-root' '-b' && |
| 72 |
-+ has stacked-prefix ${FEATURES} && |
| 73 |
-+ [[ -z ${ROOT%/} ]] && |
| 74 |
-+ [[ ${CBUILD} == ${CHOST} ]] && |
| 75 |
-+ [[ ${EPREFIX} != ${BROOT-${PORTAGE_OVERRIDE_EPREFIX}} ]] && |
| 76 |
-+ :; then |
| 77 |
-+ # When we merge into another EPREFIX, but not into some ROOT, |
| 78 |
-+ # and CHOST is equal to CBUILD, build tools found in EPREFIX |
| 79 |
-+ # perfectly work for the current build environment. |
| 80 |
-+ # In a "stacked prefix" we explicitly utilize this situation. |
| 81 |
-+ "${FUNCNAME[1]}" "${atom}" && return 0 |
| 82 |
-+ fi |
| 83 |
-+ |
| 84 |
- if [[ -n $PORTAGE_IPC_DAEMON ]] ; then |
| 85 |
- cmd+=("${PORTAGE_BIN_PATH}"/ebuild-ipc "${FUNCNAME[1]}" "${root}" "${atom}") |
| 86 |
- else |
| 87 |
-diff --git a/pym/portage/const.py b/pym/portage/const.py |
| 88 |
-index a3d927c3b..ed54425b5 100644 |
| 89 |
---- a/pym/portage/const.py |
| 90 |
-+++ b/pym/portage/const.py |
| 91 |
-@@ -204,6 +204,7 @@ SUPPORTED_FEATURES = frozenset([ |
| 92 |
- "splitdebug", |
| 93 |
- "split-elog", |
| 94 |
- "split-log", |
| 95 |
-+ "stacked-prefix", |
| 96 |
- "strict", |
| 97 |
- "strict-keepdir", |
| 98 |
- "stricter", |
| 99 |
--- |
| 100 |
-2.16.1 |
| 101 |
- |
| 102 |
-EOP |
| 103 |
- [[ $? -eq 0 ]] || return 1 |
| 104 |
- |
| 105 |
- # >=2.3 |
| 106 |
- [[ -r bin/repoman ]] || sed -i -e '/repoman/d' {man,bin}/Makefile.in |
| 107 |
- |
| 108 |
# disable ipc |
| 109 |
sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \ |
| 110 |
-i pym/_emerge/AbstractEbuildProcess.py || \ |
Archives