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 03CFB1383D3 for ; Tue, 1 Sep 2015 05:59:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF4DA14252; Tue, 1 Sep 2015 05:58:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E04E14252 for ; Tue, 1 Sep 2015 05:58:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D2443406F0 for ; Tue, 1 Sep 2015 05:58:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95C0F17E for ; Tue, 1 Sep 2015 05:58:56 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1440909094.ceafc1abfdffb34e1dc0f5e1d9ec08c02f189786.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: ceafc1abfdffb34e1dc0f5e1d9ec08c02f189786 X-VCS-Branch: pending Date: Tue, 1 Sep 2015 05:58:56 +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: dfafa94e-d31f-4285-acb0-cdfcb27d0e09 X-Archives-Hash: affe54a8cfb742bedbfae211ee77fe92 commit: ceafc1abfdffb34e1dc0f5e1d9ec08c02f189786 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sun Aug 30 04:31:34 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Aug 30 04:31:34 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ceafc1ab Don't use BOOTSTRAP_USE to update the seed but just build and bindist (if set). Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> targets/stage1/stage1-chroot.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 01ef8d1..ebd6551 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -7,7 +7,8 @@ export clst_buildpkgs="$(/tmp/build.py)" # Setup our environment BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" -[ -n "${clst_BINDIST}" ] && BOOTSTRAP_USE="${BOOTSTRAP_USE} bindist" +[ -n "${clst_BINDIST}" ] && BINDIST="bindist" +BOOTSTRAP_USE="${BOOTSTRAP_USE} ${BINDIST}" FEATURES="${clst_myfeatures} nodoc noman noinfo -news" @@ -26,8 +27,8 @@ clst_root_path=/ setup_pkgmgr "build" # Update stage3 if [ -n "${clst_update_seed}" ]; then if [ "${clst_update_seed}" == "yes" ]; then - # We might need BOOTSTRAP_USE to avoid blocks related to bindist use flag - [ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BOOTSTRAP_USE}\"" >> ${clst_make_conf} + # Set USE flags build and bindist if clst_BINDIST is set + [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}" >> ${clst_make_conf} echo "Updating seed stage..." if [ -n "${clst_update_seed_command}" ]; then @@ -37,7 +38,7 @@ if [ -n "${clst_update_seed}" ]; then fi # Clean-up USE again - sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf} + sed -i "/USE=\"${USE} build ${BINDIST}\"/d" ${clst_make_conf} elif [ "${clst_update_seed}" != "no" ]; then echo "Invalid setting for update_seed: ${clst_update_seed}"