1 |
commit: c81194a94820ab2edb8b16102416b7dbbec54c76 |
2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 22 09:26:44 2016 +0000 |
4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 22 09:27:51 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c81194a9 |
7 |
|
8 |
stage3: use symlinked bash from stage2. |
9 |
|
10 |
link with absolute path, because bin/ could be symlinked to usr/bin/. |
11 |
|
12 |
scripts/bootstrap-prefix.sh | 6 +----- |
13 |
1 file changed, 1 insertion(+), 5 deletions(-) |
14 |
|
15 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
16 |
index 42c01c4..43a401b 100755 |
17 |
--- a/scripts/bootstrap-prefix.sh |
18 |
+++ b/scripts/bootstrap-prefix.sh |
19 |
@@ -552,7 +552,7 @@ bootstrap_portage() { |
20 |
[[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1 |
21 |
[[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1 |
22 |
[[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1 |
23 |
- [[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1 |
24 |
+ [[ -x ${ROOT}/bin/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1 |
25 |
[[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1 |
26 |
export PORTAGE_BASH="${ROOT}"/tmp/bin/bash |
27 |
|
28 |
@@ -1430,10 +1430,6 @@ bootstrap_stage3() { |
29 |
emerge_pkgs --nodeps "${pkgs[@]}" || return 1 |
30 |
else |
31 |
pkgs=( |
32 |
- $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency |
33 |
- sys-libs/ncurses |
34 |
- sys-libs/readline |
35 |
- app-shells/bash |
36 |
sys-apps/sed |
37 |
app-arch/xz-utils |
38 |
sys-apps/gentoo-functions |