| 1 |
commit: b4939312598049d67c1b4fd33b6f3e86f0244101 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 4 07:25:15 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 4 07:25:15 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=b4939312 |
| 7 |
|
| 8 |
s/bootstrap-prefix.sh: remove EPREFIX/tmp after "emerge -e system". |
| 9 |
|
| 10 |
partially reverts 3a945696443b. |
| 11 |
|
| 12 |
1. A rerun of bootstrap script after "emerge -e system" failure |
| 13 |
should not go through stage1 again. |
| 14 |
2. For RAP binutils in stage3 is linked against zlib of stage2. |
| 15 |
|
| 16 |
scripts/bootstrap-prefix.sh | 14 +++++++------- |
| 17 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 20 |
index 8dc2915..8d295ed 100755 |
| 21 |
--- a/scripts/bootstrap-prefix.sh |
| 22 |
+++ b/scripts/bootstrap-prefix.sh |
| 23 |
@@ -1512,12 +1512,6 @@ EOF |
| 24 |
# Switch to the proper portage. |
| 25 |
hash -r |
| 26 |
|
| 27 |
- # Get rid of the temporary tools. |
| 28 |
- if [[ -d ${ROOT}/tmp/var/tmp ]] ; then |
| 29 |
- rm -rf "${ROOT}"/tmp |
| 30 |
- mkdir "${ROOT}"/tmp |
| 31 |
- fi |
| 32 |
- |
| 33 |
# Update the portage tree. |
| 34 |
treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s) |
| 35 |
nowdate=$(date +%s) |
| 36 |
@@ -2165,7 +2159,13 @@ EOF |
| 37 |
|
| 38 |
hash -r # tmp/* stuff is removed in stage3 |
| 39 |
|
| 40 |
- if ! emerge -e system ; then |
| 41 |
+ if emerge -e system ; then |
| 42 |
+ # Now, after 'emerge -e system', we can get rid of the temporary tools. |
| 43 |
+ if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then |
| 44 |
+ rm -Rf "${EPREFIX}"/tmp || return 1 |
| 45 |
+ mkdir -p "${EPREFIX}"/tmp || return 1 |
| 46 |
+ fi |
| 47 |
+ else |
| 48 |
# emerge -e system fail |
| 49 |
cat << EOF |
Archives