From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 CD00C13832E for ; Mon, 22 Aug 2016 09:28:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C74BB21C038; Mon, 22 Aug 2016 09:28:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73FE721C038 for ; Mon, 22 Aug 2016 09:28:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B3ED340662 for ; Mon, 22 Aug 2016 09:28:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B7782444 for ; Mon, 22 Aug 2016 09:28:26 +0000 (UTC) From: "Benda XU" 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" Message-ID: <1471858071.c81194a94820ab2edb8b16102416b7dbbec54c76.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: c81194a94820ab2edb8b16102416b7dbbec54c76 X-VCS-Branch: master Date: Mon, 22 Aug 2016 09:28:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4d1ea63c-fdb9-4406-a5da-3e4e981d558b X-Archives-Hash: e3f66d2d63b1c0e98f584982571ce525 commit: c81194a94820ab2edb8b16102416b7dbbec54c76 Author: Benda Xu gentoo org> AuthorDate: Mon Aug 22 09:26:44 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Aug 22 09:27:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c81194a9 stage3: use symlinked bash from stage2. link with absolute path, because bin/ could be symlinked to usr/bin/. scripts/bootstrap-prefix.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 42c01c4..43a401b 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -552,7 +552,7 @@ bootstrap_portage() { [[ -x ${ROOT}/tmp/bin/bash ]] || [[ ! -x ${ROOT}/tmp/usr/bin/bash ]] || ln -s ../usr/bin/bash "${ROOT}"/tmp/bin/bash || return 1 [[ -x ${ROOT}/tmp/bin/bash ]] || ln -s "${BASH}" "${ROOT}"/tmp/bin/bash || return 1 [[ -x ${ROOT}/tmp/bin/sh ]] || ln -s bash "${ROOT}"/tmp/bin/sh || return 1 - [[ -x ${ROOT}/bin/bash ]] || ln -s ../tmp/bin/bash "${ROOT}"/bin/bash || return 1 + [[ -x ${ROOT}/bin/bash ]] || ln -s "${ROOT}"{/tmp,}/bin/bash || return 1 [[ -x ${ROOT}/bin/sh ]] || ln -s bash "${ROOT}"/bin/sh || return 1 export PORTAGE_BASH="${ROOT}"/tmp/bin/bash @@ -1430,10 +1430,6 @@ bootstrap_stage3() { emerge_pkgs --nodeps "${pkgs[@]}" || return 1 else pkgs=( - $([[ ${CHOST} == *-aix* ]] && echo dev-libs/libiconv ) # bash dependency - sys-libs/ncurses - sys-libs/readline - app-shells/bash sys-apps/sed app-arch/xz-utils sys-apps/gentoo-functions