From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/
Date: Mon, 24 Oct 2016 07:15:27 +0000 (UTC) [thread overview]
Message-ID: <1477293299.908c65964befc90d5548ee35e807ec52ef88e5c6.heroxbd@gentoo> (raw)
commit: 908c65964befc90d5548ee35e807ec52ef88e5c6
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 07:14:59 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 07:14:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/android.git/commit/?id=908c6596
sys-apps/portage: prefixify 2.3.2.
sys-apps/portage/Manifest | 4 +-
.../files/portage-2.3.0-prefix-path-only.patch | 45 ++++++++++++++--------
sys-apps/portage/portage-2.3.2.ebuild | 5 +++
3 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 310a653..4429da2 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,14 @@
AUX 2.3.1-doc-Revert-URI-changes-related-to-docbook-schema.patch 1394 SHA256 a076b70b775aef23e89127d2fc64065f2d7a895b3b56a723122f641375b7c3d3 SHA512 fb3488ec9c5a849bdc9ae2cfaed3732c939072cd847534fdeaaff28560b62ad5b184f15bfb6943b921f417ec7de8e1fd3845322a0ba4d3e55f625a12cf903dcd WHIRLPOOL ddf6cd307f063404f53e9e819b01965b053df7554790d1332a5d131c11e5e6eec466412c17c4d8b3dd124ab81797641001ec3bbcfadd7ff06f5e59b2f40dc7d2
AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
AUX portage-2.3.0-ldconfig-path.patch 1311 SHA256 7cd9acd6c1cd2a304348819a7232abe4a71473769a94ef1af9d8a956c81749ac SHA512 22ada6f4d39bdd35ffbc5e248f6ca490af8f84eb471d44bc39c8a517e61a1d04071fd1bbf3f78aed92f2c8b61ddc1465f4ccfb298dcce24ee1808d48b83c3d16 WHIRLPOOL 0023fafb781932e484278017cbf72637eed91f83673c34d5094d4c65cf981ba16d5c7c3b10879e4013fc83a8f941a99acd5d71b40673b4372f689de5a3d2e2ac
-AUX portage-2.3.0-prefix-path-only.patch 1089 SHA256 e72cb1f1c1ad9d2c5b6179930d87fcb5fc58cc8a25eed654a166463d5a75749a SHA512 6b28b9df57651237599736bf582e286e44353f47d5f0f0e4a65cd6d3ff87a0f216e0948f0e0aa2874d86233e14c832f0060cc264eee7c668e2d9be3df1279823 WHIRLPOOL eb100086ebd20f7956c47320159f6ce1aed22edd5f48671f8e2bd11d66e979fd0175a6e0bf1ad1caf5860ae51635fe197d74ae7c13f025778ede8f5a81bf4caa
+AUX portage-2.3.0-prefix-path-only.patch 1725 SHA256 1d087d0855c3f68fce817d31192209f4fe271f5bbf98030ab72621671cd4529e SHA512 408fcc71ca0dc0b8cdc99aff29c8c94e22ab1205257cc6a48e439abb0b34ddc4366f093d46719899c6c9a52075e2a72db31a28f13ca9aace45b9350266c609db WHIRLPOOL e3c2e1e27496c41d9b84188f2692f6f91b18b9317097ffe517515687a853e0c01f93fe5ec4059177892ead2bf851f9eb68c2a23905f081f13193032d5c8bf535
AUX portage-2.3.0_rc1.patch 2278 SHA256 5c10f7bf71250a87576bf81635a765e6fdfdaa7882fe7e1949c736ae1472c2d6 SHA512 0e26adc69b3b716c7435d54a2ed4252045cb24e7891eed5d88514e6066ee4b1fc32ba89d63dc63e2341456110bc7def0bf1a49c1cb3cb53c0d9092bb251f9151 WHIRLPOOL 3964864f80131293283aa79ef1e87e5975e2543e456515c00cf6bd38905c2502539b9698634a44123db9e8ab3c566645b5424c29390a0f47ae7df62431355928
DIST portage-2.3.0.tar.bz2 907500 SHA256 1fbed03f78587c80f5afd36b57d7ac085ed5e5b2cc19fea63fc8a43a477e4067 SHA512 85d15a234e446677dc3458de8dacaa0d91164b190c59f8002ff98dc27a9ad699cba6c4f871ac785ba6116ed53f1f3530ec3ed662ce7f4b3e8c49380b4b206074 WHIRLPOOL 979a7fc61a65dca790a077d4839fbbb22fc8ef31ccbe534b12b87c699a25a1930586dd6ddfb9013d57a71c03ed8d976612ea15e9dc3541aff0b67e3d604a5be2
DIST portage-2.3.0_rc1.tar.bz2 910204 SHA256 52cf0837975c4b2a8e1d3d18e3334a735b14e4ebdbdca8992548b86c1d5bebd1 SHA512 d7a5ce8800668606a2e3549621686bb8bb30bd2f5d7a57b106efc1c58d34b95cef4605f5067824db0beb6f870c9e81cb3fdb5c074e9e64bef40a9df6f524ad13 WHIRLPOOL c4c86fe20606e93ecf4d125f436077ec4d15cb453c98e83894a8383f1654a9b294107c9c04bb3019f66a643ff42c333060319d59dda47c323e9711723c3b9cfe
DIST portage-2.3.1.tar.bz2 918411 SHA256 a3c5ee98791c579687ad5ec6a7882a6b6a486a54c14d1bc73ccc9a79b4a507e9 SHA512 75a713cfa077ac271ad7fad0a48bbc923beedd2ec47000602576297fabae2de47ee69e7e6d52e02c87f9ba5d9e5b27c10fa9be7b308f72c6dcc8e7f6c321f2c6 WHIRLPOOL 4ee7942d73e8e5b977d0260b568d31d0b49387787f7ffa2e77d4ec49e00b3e67c54506840be463cb5a6da070683013192f46bb47df1df1a328457de1796d05c0
+DIST portage-2.3.2.tar.bz2 919270 SHA256 724a9924209c5da5e7ba7f19812db0675bb3b4309f911e37da8c35bbc3fede67 SHA512 bee95d0308a613083a28b05e5276bc3c4eb5841e17985e3c943a92bc5b9a659eb18ae822219d26da80144febf47b5ad30766536f820162812549f0bc83975bec WHIRLPOOL 0836aac5d9e331d896053160d8e829f997697f83bd3dbe4f14b924b9aa7c41a7c53e48e4ea5873fba05d4d23d715b310e92a10fed348b7ad55afbde149864f20
EBUILD portage-2.3.0.ebuild 11517 SHA256 16b10e751c98dc45735697b50a4df638ccce75745f2a04004dbc5c0897d4b0ed SHA512 bc44fd3cdab534b513fc00a6c27a06f42a9448c53008a470c976f2b520b0f606ec14f532eeff1c3740abd520a09bf886b005ec427a730bfbd1086093b4b7a6c3 WHIRLPOOL 068f283095fbe0bc417fd2856cc30be867001708e8d9b8daaa3a1027995bc0a2ef2ab7a9fa6bcc3fb892628e597fb55e1bc5a3795d609650c5c98b1c30d56e91
EBUILD portage-2.3.0_rc1-r1.ebuild 11651 SHA256 2ad29bbb196cf1aee3101e40d18b81537371358327614c1752e427ee713801fe SHA512 b289f6fb24e159ad99248438739607d5e670b1c3d5353d64708e4751961e249d81a9fabf7fe3fc274533982aeca96c091f5cb2787af7a6030d18b313d3172728 WHIRLPOOL 77b92fbecfc492aef0edeffc1742dc839bbe21fae0b6308c9f91bb96909b17d97933c15b2cacf7ec746847c63a376c280ecb28b293e7e1876df657ed3b4841b0
EBUILD portage-2.3.1.ebuild 11594 SHA256 8551819a28d41a6fb7e291e37bf9289efa329dc0addb21b7a729cbabdd96aa65 SHA512 c864bf3a6a916a9865738de504dfeef82ffe48177c1635b7a6dd4e3dcec3e78daa33be5ff6fb6edc15e5e91b8551046ff0a318579ee60f40fc1d96ad1614619a WHIRLPOOL 46a0652cf699e0c3435a7a8ba3c09705ea53b030f501bfec267a0f4020c908817e35c05b5d278791657739892f7b6e078c48107a5f1a6d05dde78b5e4f4d6eb3
+EBUILD portage-2.3.2.ebuild 11529 SHA256 cce0948c655eed88b0e3e0e9dc283cb05a47c778440cd4b576796a680cb84a52 SHA512 791ce4506b24ced68dd0d09cf5cf9a1fac08b11b6b3b1dfd13831c2b2276db7d701c08b03771732e59b710c7bbd2b5cb0d92942c81123d3dfc070716ab4fefdf WHIRLPOOL b528eee31f6721e680739db5486afbf6982d01329611cc402f048ceffbae6ac550def47ce378608fdbcf7ff8c781ad00cb249bfae7c97f1d60313dc91eb5bd6a
MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166
diff --git a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
index f2fe0f0..378b9d8 100644
--- a/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
+++ b/sys-apps/portage/files/portage-2.3.0-prefix-path-only.patch
@@ -1,31 +1,44 @@
-When eprefix is defined, no host tools should be used.
+commit b3e47525357322433126389533501c42cd092979
+Author: Benda Xu <heroxbd@gentoo.org>
+Date: Sat Jun 18 14:32:07 2016 +0900
+
+ 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.
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
-index 26e6123..c266c83 100644
+index 52dbf8b..304b164 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
-@@ -205,11 +205,6 @@ def _doebuild_path(settings, eapi=None):
+@@ -199,16 +199,18 @@ 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]
overrides = [x for x in settings.get(
"__PORTAGE_TEST_PATH_OVERRIDE", "").split(":") if x]
-- prefixes = []
+ prefixes = []
- if eprefix:
- prefixes.append(eprefix)
- prefixes.append("/")
--
++ # tools in EPREFIX can only be executed when ROOT is /.
++ if settings["ROOT"] == "/":
++ prefixes.append(settings["EPREFIX"])
++ # settings["EPREFIX"] could be overridden during cross-eprefix
++ if portage.const.EPREFIX != settings["EPREFIX"]:
++ prefixes.append(portage.const.EPREFIX)
+
path = overrides
- if "xattr" in settings.features:
-@@ -231,9 +226,9 @@ def _doebuild_path(settings, eapi=None):
- path.append(os.path.join(x, "ebuild-helpers"))
+@@ -232,6 +234,7 @@ def _doebuild_path(settings, eapi=None):
path.extend(prerootpath)
-- for prefix in prefixes:
-- for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
-- path.append(os.path.join(prefix, x))
-+ prefix = eprefix if eprefix else "/"
-+ for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
-+ path.append(os.path.join(prefix, x))
+ for prefix in prefixes:
++ prefix = prefix if prefix else "/"
+ for x in ("usr/local/sbin", "usr/local/bin", "usr/sbin", "usr/bin", "sbin", "bin"):
+ path.append(os.path.join(prefix, x))
- path.extend(rootpath)
- settings["PATH"] = ":".join(path)
diff --git a/sys-apps/portage/portage-2.3.2.ebuild b/sys-apps/portage/portage-2.3.2.ebuild
index a9c7910..3c35c22 100644
--- a/sys-apps/portage/portage-2.3.2.ebuild
+++ b/sys-apps/portage/portage-2.3.2.ebuild
@@ -78,6 +78,11 @@ TARBALL_PV=${PV}
SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.0-ldconfig-path.patch
+ "${FILESDIR}"/${PN}-2.3.0-prefix-path-only.patch
+)
+
pkg_setup() {
use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
}
next reply other threads:[~2016-10-24 7:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-24 7:15 Benda XU [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-10-09 5:47 [gentoo-commits] proj/android:master commit in: sys-apps/portage/files/, sys-apps/portage/ Benda XU
2016-10-09 5:47 Benda XU
2016-07-21 2:23 [gentoo-commits] dev/heroxbd:master " Benda XU
2016-06-15 3:18 ` [gentoo-commits] proj/android:master " Benda XU
2016-06-07 6:06 Benda XU
2016-05-26 4:05 Benda XU
2016-05-25 5:03 [gentoo-commits] dev/heroxbd:master " Benda XU
2016-05-26 4:05 ` [gentoo-commits] proj/android:master " Benda XU
2015-03-05 3:00 Benda XU
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477293299.908c65964befc90d5548ee35e807ec52ef88e5c6.heroxbd@gentoo \
--to=heroxbd@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox