Gentoo Archives: gentoo-commits

From: Benda XU <heroxbd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Mon, 27 Nov 2017 00:42:34
Message-Id: 1511743326.4233fe3f1bd46ad9b26b226f392d68db706e1be2.heroxbd@gentoo
1 commit: 4233fe3f1bd46ad9b26b226f392d68db706e1be2
2 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 26 06:28:21 2017 +0000
4 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 27 00:42:06 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4233fe3f
7
8 bootstrap-prefix.sh: get rid of the portage-stage overlay.
9
10 We can now 100% stand on gentoo main repository.
11
12 scripts/bootstrap-prefix.sh | 17 -----------------
13 1 file changed, 17 deletions(-)
14
15 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
16 index f8eb310892..c6f71bd8a6 100755
17 --- a/scripts/bootstrap-prefix.sh
18 +++ b/scripts/bootstrap-prefix.sh
19 @@ -318,19 +318,6 @@ bootstrap_setup() {
20 } > "${ROOT}"/etc/portage/make.conf
21 fi
22
23 - if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then
24 - cat >"${ROOT}"/etc/portage/repos.conf <<-EOF
25 - [DEFAULT]
26 - eclass-overrides = rap
27 -
28 - [rap]
29 - location = ${ROOT}/usr/portage-stage
30 - sync-type = git
31 - sync-uri = https://anongit.gentoo.org/git/proj/android.git
32 - auto-sync = no
33 - EOF
34 - fi
35 -
36 if is-rap ; then
37 [[ -f ${ROOT}/etc/passwd ]] || getent passwd > "${ROOT}"/etc/passwd || \
38 ln -sf {,"${ROOT}"}/etc/passwd
39 @@ -523,10 +510,6 @@ bootstrap_tree() {
40 else
41 do_tree http://dev.gentoo.org/~grobian/distfiles prefix-overlay-${PV}.tar.bz2
42 fi
43 - if is-rap; then
44 - PORTDIR="${ROOT}/usr/portage-stage" \
45 - do_tree http://dev.gentoo.org/~heroxbd android-master.tar.bz2
46 - fi
47 }
48
49 bootstrap_startscript() {