From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 55B631382BD for ; Wed, 15 Jun 2016 11:33:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7899E099D; Wed, 15 Jun 2016 11:32:54 +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 80769E097C for ; Wed, 15 Jun 2016 11:32:52 +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 AEEAB340817 for ; Wed, 15 Jun 2016 11:32:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1B742421 for ; Wed, 15 Jun 2016 11:32:46 +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: <1465990356.71c06cb062ae5261de9e56c36e6a5b3d3cc510ea.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:rap0 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: 71c06cb062ae5261de9e56c36e6a5b3d3cc510ea X-VCS-Branch: rap0 Date: Wed, 15 Jun 2016 11:32:46 +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: 6c6e59ad-c770-439d-97ea-fb91c57b0df0 X-Archives-Hash: c40690dc1d704059a6a11bbcc7ec9c2f commit: 71c06cb062ae5261de9e56c36e6a5b3d3cc510ea Author: Benda Xu gentoo org> AuthorDate: Sat Jun 4 07:25:15 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Wed Jun 15 11:32:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=71c06cb0 s/bootstrap-prefix.sh: remove EPREFIX/tmp after "emerge -e system". partially reverts 3a945696443b. 1. A rerun of bootstrap script after "emerge -e system" failure should not go through stage1 again. 2. For RAP binutils in stage3 is linked against zlib of stage2. scripts/bootstrap-prefix.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index a5db862..7e73ca2 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1514,12 +1514,6 @@ EOF # Switch to the proper portage. hash -r - # Get rid of the temporary tools. - if [[ -d ${ROOT}/tmp/var/tmp ]] ; then - rm -rf "${ROOT}"/tmp - mkdir "${ROOT}"/tmp - fi - # Update the portage tree. treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s) nowdate=$(date +%s) @@ -2167,7 +2161,13 @@ EOF hash -r # tmp/* stuff is removed in stage3 - if ! emerge -e system ; then + if emerge -e system ; then + # Now, after 'emerge -e system', we can get rid of the temporary tools. + if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then + rm -Rf "${EPREFIX}"/tmp || return 1 + mkdir -p "${EPREFIX}"/tmp || return 1 + fi + else # emerge -e system fail cat << EOF