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 93000138334 for ; Fri, 22 Jun 2018 14:34:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D617CE085B; Fri, 22 Jun 2018 14:34:36 +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 A8C5EE085B for ; Fri, 22 Jun 2018 14:34:36 +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 C5EA2335C9A for ; Fri, 22 Jun 2018 14:34:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C75072D6 for ; Fri, 22 Jun 2018 14:34:31 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1529675092.9ff91cd60df019c1b008bdafcd32aac9e5811d5f.haubi@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: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: 9ff91cd60df019c1b008bdafcd32aac9e5811d5f X-VCS-Branch: master Date: Fri, 22 Jun 2018 14:34:31 +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-Archives-Salt: 9d39d934-fcf6-499f-a7ff-b1b6b0c9c4e1 X-Archives-Hash: 385035d608f2fbbbc2372eb4ebb73432 commit: 9ff91cd60df019c1b008bdafcd32aac9e5811d5f Author: Michael Haubenwallner gentoo org> AuthorDate: Fri Jun 22 13:41:30 2018 +0000 Commit: Michael Haubenwallner gentoo org> CommitDate: Fri Jun 22 13:44:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9ff91cd6 bootstrap-prefix.sh: only tmp portage really needs the stacked-prefix patch There is no need to put it into etc/portage/patches/sys-apps/portage/, because when portage itself is merged in stage3, everything's there. scripts/bootstrap-prefix.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 5440b54289..046a7918d0 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -628,8 +628,7 @@ bootstrap_portage() { cd "${S}" # patch temporary included here: fail when it should be dropped - mkdir -p "${ROOT}"/etc/portage/patches/sys-apps/portage || return 1 - cat > "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch <<'EOP' + patch -p1 <<'EOP' From 902fad63990eb4516d3e3815994b2dcbd16155fd Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 19 Jun 2018 16:39:12 +0200 @@ -691,7 +690,6 @@ index a3d927c3b..ed54425b5 100644 EOP [[ $? -eq 0 ]] || return 1 - patch -p1 < "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch || return 1 # >=2.3 [[ -r bin/repoman ]] || sed -i -e '/repoman/d' {man,bin}/Makefile.in @@ -1876,9 +1874,6 @@ bootstrap_stage3() { USE="ssl" \ emerge_pkgs "" "${pkgs[@]}" || return 1 - # patch temporary included here: fail when it should be dropped - rm "${ROOT}"/etc/portage/patches/sys-apps/portage/0001-introduce-the-stacked-prefix-FEATURE.patch || return 1 - # Switch to the proper portage. hash -r