From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1A9121382B5 for ; Wed, 15 Jun 2016 08:04:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AD16E09B0; Wed, 15 Jun 2016 08:04:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BE62E099D for ; Wed, 15 Jun 2016 08:04:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF1603403C1 for ; Wed, 15 Jun 2016 08:04:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 328FB241A for ; Wed, 15 Jun 2016 08:04:22 +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: <1465977736.94b33c1bc3251401014b010c9b983ff7365058bb.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:rap0 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: 94b33c1bc3251401014b010c9b983ff7365058bb X-VCS-Branch: rap0 Date: Wed, 15 Jun 2016 08:04:22 +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: 60f4cd41-169e-4820-aebb-a29de64d28d4 X-Archives-Hash: ab265fc030c1011d242e59140b70660d commit: 94b33c1bc3251401014b010c9b983ff7365058bb Author: Benda Xu gentoo org> AuthorDate: Wed Jun 15 08:02:16 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Jun 15 08:02:16 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=94b33c1b scripts/bootstrap-prefix.sh: setup android overlay as staged RAP repo. setup name databases. scripts/bootstrap-prefix.sh | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 7096801..828043f 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -238,6 +238,34 @@ bootstrap_setup() { } > "${ROOT}"/etc/portage/make.conf fi + if is-rap && [[ ! -f ${ROOT}/etc/portage/repos.conf ]] ; then + cat <"${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 = 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 + [[ -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 ]] || cp {,"${ROOT}"}/etc/hosts + fi + local linux=$(rapx linux-standalone linux) case ${CHOST} in @@ -419,6 +447,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 http://dev.gentoo.org/~heroxbd android-master.tar.bz2 + fi } bootstrap_startscript() { @@ -528,7 +560,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