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 0EADF138334 for ; Sun, 23 Dec 2018 10:32:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF037E09F1; Sun, 23 Dec 2018 10:32:56 +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 A30C6E09F1 for ; Sun, 23 Dec 2018 10:32:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DF636335C7B for ; Sun, 23 Dec 2018 10:32:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48A8B4F7 for ; Sun, 23 Dec 2018 10:32:53 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1545561128.83c39c9620ec89e1eefd8c0a19d38ad3719e5e81.heroxbd@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: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 83c39c9620ec89e1eefd8c0a19d38ad3719e5e81 X-VCS-Branch: master Date: Sun, 23 Dec 2018 10:32:53 +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: f1d6fe1b-167a-47a1-acdb-846e2dbb85d1 X-Archives-Hash: d7baa87516654c6f006233678f9422ea commit: 83c39c9620ec89e1eefd8c0a19d38ad3719e5e81 Author: Benda Xu gentoo org> AuthorDate: Sun Dec 23 10:26:10 2018 +0000 Commit: Benda XU gentoo 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 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 || \