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 839DC138AE9 for ; Mon, 27 Nov 2017 00:42:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8277DE0BE5; Mon, 27 Nov 2017 00:42:33 +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 5F0A4E0BE5 for ; Mon, 27 Nov 2017 00:42:33 +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 1239633D3C7 for ; Mon, 27 Nov 2017 00:42:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62E3CA8AF for ; Mon, 27 Nov 2017 00:42:30 +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: <1511743326.4233fe3f1bd46ad9b26b226f392d68db706e1be2.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: 4233fe3f1bd46ad9b26b226f392d68db706e1be2 X-VCS-Branch: master Date: Mon, 27 Nov 2017 00:42:30 +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: 1aae90eb-d7cf-48e8-a1a4-032755583b54 X-Archives-Hash: 38e91a47f78735852d78b46a60d273d7 commit: 4233fe3f1bd46ad9b26b226f392d68db706e1be2 Author: Benda Xu gentoo org> AuthorDate: Sun Nov 26 06:28:21 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 00:42:06 2017 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4233fe3f bootstrap-prefix.sh: get rid of the portage-stage overlay. We can now 100% stand on gentoo main repository. scripts/bootstrap-prefix.sh | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index f8eb310892..c6f71bd8a6 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -318,19 +318,6 @@ bootstrap_setup() { } > "${ROOT}"/etc/portage/make.conf fi - if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then - cat >"${ROOT}"/etc/portage/repos.conf <<-EOF - [DEFAULT] - eclass-overrides = rap - - [rap] - location = ${ROOT}/usr/portage-stage - sync-type = git - sync-uri = https://anongit.gentoo.org/git/proj/android.git - auto-sync = no - EOF - fi - if is-rap ; then [[ -f ${ROOT}/etc/passwd ]] || getent passwd > "${ROOT}"/etc/passwd || \ ln -sf {,"${ROOT}"}/etc/passwd @@ -523,10 +510,6 @@ bootstrap_tree() { else do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2 fi - if is-rap; then - PORTDIR="${ROOT}/usr/portage-stage" \ - do_tree http://dev.gentoo.org/~heroxbd android-master.tar.bz2 - fi } bootstrap_startscript() {