commit:     83c39c9620ec89e1eefd8c0a19d38ad3719e5e81
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 10:26:10 2018 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 10:32:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83c39c96

scripts/bootstrap-prefix.sh: patch stage2 portage.

  Prevent fork loop of portageq, as committed in,
  
https://gitweb.gentoo.org/proj/portage.git/commit/?id=daeb75b345c4433218ab9e7a5319e8914092f048

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 95b884ec6b..ccde89e863 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -627,6 +627,11 @@ 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 || \

Reply via email to