From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-996281-garchives=archives.gentoo.org@lists.gentoo.org>
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 821D4138331
for <garchives@archives.gentoo.org>; Mon, 8 Jan 2018 07:53:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C1703E0B6F;
Mon, 8 Jan 2018 07:53:14 +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 9F3AFE0B7D
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2018 07:53:14 +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 6A356340FAA
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2018 07:53:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B1FE7186
for <gentoo-commits@lists.gentoo.org>; Mon, 8 Jan 2018 07:53:11 +0000 (UTC)
From: "Benda XU" <heroxbd@gentoo.org>
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" <heroxbd@gentoo.org>
Message-ID: <1515397943.24468235c3e00c94ff0ae08b6e229f98cfa23a02.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: 24468235c3e00c94ff0ae08b6e229f98cfa23a02
X-VCS-Branch: master
Date: Mon, 8 Jan 2018 07:53:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: cdb1601d-0aef-4a54-a356-7008d278408f
X-Archives-Hash: c97ed79fbd5e603e300e499497fcf4d1
commit: 24468235c3e00c94ff0ae08b6e229f98cfa23a02
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 07:13:29 2018 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 07:52:23 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24468235
scripts/bootstrap-prefix.sh: do not shortcut when EPREFIX/tmp exists.
Do not put profiles into overlay.
scripts/bootstrap-prefix.sh | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 88f7dbcd1f..d38790b1b8 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -427,12 +427,6 @@ bootstrap_setup() {
profile=${PROFILE_BASE:-prefix}/${profile#prefix/}${PROFILE_VARIANT:+/${PROFILE_VARIANT}}
if [[ -n ${profile} && ! -e ${ROOT}/etc/portage/make.profile ]] ; then
local fullprofile="${PORTDIR}/profiles/${profile}"
- for base in ${PORTDIR_OVERLAY} ; do
- if [[ -e ${base}/profiles/${profile}/parent ]] ; then
- fullprofile="${base}/profiles/${profile}"
- break
- fi
- done
ln -s "${fullprofile}" "${ROOT}"/etc/portage/make.profile
einfo "Your profile is set to ${fullprofile}."
@@ -1138,10 +1132,11 @@ bootstrap_bzip2() {
bootstrap_stage_host_gentoo() {
if [[ ! -L ${ROOT}/tmp ]] ; then
if [[ -e ${ROOT}/tmp ]] ; then
- echo "${ROOT}/tmp should be a symlink to ${HOST_GENTOO_EROOT}"
- return 1
+ einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}"
+ einfo "Let's ignore the shortcut and continue."
+ else
+ ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp
fi
- ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp
fi
# checks itself if things need to be done still
@@ -2232,7 +2227,7 @@ EOF
# Figure out if we are bootstrapping from an existing Gentoo
# It can be forced by setting HOST_GENTOO_EROOT manually
- local t_GENTOO_EROOT=$(/usr/bin/portageq envvar EROOT 2> /dev/null)
+ local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null)
if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then
cat <<EOF