| 1 |
commit: 24468235c3e00c94ff0ae08b6e229f98cfa23a02 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 8 07:13:29 2018 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 8 07:52:23 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=24468235 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix.sh: do not shortcut when EPREFIX/tmp exists. |
| 9 |
|
| 10 |
Do not put profiles into overlay. |
| 11 |
|
| 12 |
scripts/bootstrap-prefix.sh | 15 +++++---------- |
| 13 |
1 file changed, 5 insertions(+), 10 deletions(-) |
| 14 |
|
| 15 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 16 |
index 88f7dbcd1f..d38790b1b8 100755 |
| 17 |
--- a/scripts/bootstrap-prefix.sh |
| 18 |
+++ b/scripts/bootstrap-prefix.sh |
| 19 |
@@ -427,12 +427,6 @@ bootstrap_setup() { |
| 20 |
profile=${PROFILE_BASE:-prefix}/${profile#prefix/}${PROFILE_VARIANT:+/${PROFILE_VARIANT}} |
| 21 |
if [[ -n ${profile} && ! -e ${ROOT}/etc/portage/make.profile ]] ; then |
| 22 |
local fullprofile="${PORTDIR}/profiles/${profile}" |
| 23 |
- for base in ${PORTDIR_OVERLAY} ; do |
| 24 |
- if [[ -e ${base}/profiles/${profile}/parent ]] ; then |
| 25 |
- fullprofile="${base}/profiles/${profile}" |
| 26 |
- break |
| 27 |
- fi |
| 28 |
- done |
| 29 |
|
| 30 |
ln -s "${fullprofile}" "${ROOT}"/etc/portage/make.profile |
| 31 |
einfo "Your profile is set to ${fullprofile}." |
| 32 |
@@ -1138,10 +1132,11 @@ bootstrap_bzip2() { |
| 33 |
bootstrap_stage_host_gentoo() { |
| 34 |
if [[ ! -L ${ROOT}/tmp ]] ; then |
| 35 |
if [[ -e ${ROOT}/tmp ]] ; then |
| 36 |
- echo "${ROOT}/tmp should be a symlink to ${HOST_GENTOO_EROOT}" |
| 37 |
- return 1 |
| 38 |
+ einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}" |
| 39 |
+ einfo "Let's ignore the shortcut and continue." |
| 40 |
+ else |
| 41 |
+ ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp |
| 42 |
fi |
| 43 |
- ln -s "${HOST_GENTOO_EROOT}" "${ROOT}"/tmp |
| 44 |
fi |
| 45 |
|
| 46 |
# checks itself if things need to be done still |
| 47 |
@@ -2232,7 +2227,7 @@ EOF |
| 48 |
|
| 49 |
# Figure out if we are bootstrapping from an existing Gentoo |
| 50 |
# It can be forced by setting HOST_GENTOO_EROOT manually |
| 51 |
- local t_GENTOO_EROOT=$(/usr/bin/portageq envvar EROOT 2> /dev/null) |
| 52 |
+ local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null) |
| 53 |
if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then |
| 54 |
cat <<EOF |
Archives