From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/prefix:script-rap commit in: scripts/
Date: Fri, 27 May 2016 10:53:52 +0000 (UTC) [thread overview]
Message-ID: <1464270941.eb97b1ce2322d18a749aaf958f227a2c3f8cdf20.heroxbd@gentoo> (raw)
commit: eb97b1ce2322d18a749aaf958f227a2c3f8cdf20
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 10:14:33 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu May 26 13:55:41 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=eb97b1ce
scripts/bootstrap-prefix.sh: setup android overlay as staged RAP repo.
setup name databases.
scripts/bootstrap-prefix.sh | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 4c2c892..86056e6 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -234,6 +234,33 @@ bootstrap_setup() {
} > "${ROOT}"/etc/portage/make.conf
fi
+ if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then
+ cat <<EOF >"${ROOT}"/etc/portage/repos.conf
+[DEFAULT]
+main-repo = gentoo
+eclass-overrides = rap
+
+[gentoo]
+location = ${ROOT}/usr/portage
+sync-type = rsync
+sync-uri = rsync://rsync.gentoo.org/gentoo-portage
+
+[rap]
+location = ${ROOT}/usr/portage-stage
+sync-type = webrsync
+sync-uri = https://gitweb.gentoo.org/proj/android.git/snapshot/android-master.tar.bz2
+EOF
+ fi
+
+ if is-rap ; then
+ [[ -f ${ROOT}/etc/passwd ]] || getent passwd > "${ROOT}"/etc/passwd || \
+ ln -sf {,"${ROOT}"}/etc/passwd
+ [[ -f ${ROOT}/etc/group ]] || getent group > "${ROOT}"/etc/group || \
+ ln -sf {,"${ROOT}"}/etc/group
+ [[ -f ${ROOT}/etc/resolv.conf ]] || ln -s {,"${ROOT}"}/etc/resolv.conf
+ [[ -f ${ROOT}/etc/hosts ]] || ln -s {,"${ROOT}"}/etc/hosts
+ fi
+
local linux=$(rapx linux-standalone linux)
case ${CHOST} in
@@ -415,6 +442,10 @@ 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 https://gitweb.gentoo.org/proj/android.git/snapshot android-master.tar.bz2
+ fi
}
bootstrap_startscript() {
@@ -524,7 +555,9 @@ bootstrap_portage() {
[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}" "${ROOT}"/tmp/usr/portage
- if [[ -s ${PORTDIR}/profiles/repo_name ]]; then
+ if is-rap; then
+ cp -f "${ROOT}"/etc/portage/repos.conf "${ROOT}"/tmp/usr/share/portage/config/repos.conf
+ elif [[ -s ${PORTDIR}/profiles/repo_name ]]; then
# sync portage's repos.conf with the tree being used
sed -i -e "s,gentoo_prefix,$(<"${PORTDIR}"/profiles/repo_name)," "${ROOT}"/tmp/usr/share/portage/config/repos.conf || return 1
fi
next reply other threads:[~2016-05-27 10:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-27 10:53 Benda XU [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-05-27 10:53 [gentoo-commits] repo/proj/prefix:script-rap commit in: scripts/ Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
2016-05-27 10:53 Benda XU
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464270941.eb97b1ce2322d18a749aaf958f227a2c3f8cdf20.heroxbd@gentoo \
--to=heroxbd@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox