| 1 |
commit: ea38c545ce810d80aea1eb7c6e5e4d2117e6f211 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 16 04:21:00 2018 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 16 04:22:16 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=ea38c545 |
| 7 |
|
| 8 |
bootstrap-prefix.sh: do not take a shortcut if ! is-rap. |
| 9 |
|
| 10 |
scripts/bootstrap-prefix.sh | 8 +++++++- |
| 11 |
1 file changed, 7 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 14 |
index a1cc564f61..1119dabc06 100755 |
| 15 |
--- a/scripts/bootstrap-prefix.sh |
| 16 |
+++ b/scripts/bootstrap-prefix.sh |
| 17 |
@@ -1163,6 +1163,12 @@ bootstrap_bzip2() { |
| 18 |
} |
| 19 |
|
| 20 |
bootstrap_stage_host_gentoo() { |
| 21 |
+ if ! is-rap ; then |
| 22 |
+ einfo "Shortcut only supports prefix-standalone, but we are bootstrapping" |
| 23 |
+ einfo "prefix-rpath. Do nothing." |
| 24 |
+ return 0 |
| 25 |
+ fi |
| 26 |
+ |
| 27 |
if [[ ! -L ${ROOT}/tmp ]] ; then |
| 28 |
if [[ -e ${ROOT}/tmp ]] ; then |
| 29 |
einfo "${ROOT}/tmp exists and is not a symlink to ${HOST_GENTOO_EROOT}" |
| 30 |
@@ -2305,7 +2311,7 @@ EOF |
| 31 |
# Figure out if we are bootstrapping from an existing Gentoo |
| 32 |
# It can be forced by setting HOST_GENTOO_EROOT manually |
| 33 |
local t_GENTOO_EROOT=$(env -u EPREFIX portageq envvar EROOT 2> /dev/null) |
| 34 |
- if [[ ! -d ${HOST_GENTOO_EROOT} ]] && [[ -d ${t_GENTOO_EROOT} ]]; then |
| 35 |
+ if [[ ! -d ${HOST_GENTOO_EROOT} && -d ${t_GENTOO_EROOT} ]]; then |
| 36 |
cat <<EOF |
| 37 |
|
| 38 |
Sweet, a Gentoo Penguin is found at ${t_GENTOO_EROOT}. Hey, you are |
Archives