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 45DC613835A for ; Mon, 18 Jan 2021 19:53:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47234E077A; Mon, 18 Jan 2021 19:53:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32C8DE077A for ; Mon, 18 Jan 2021 19:53:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E068340EEF for ; Mon, 18 Jan 2021 19:53:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F67E4A1 for ; Mon, 18 Jan 2021 19:53:45 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1608004360.5f62563f52a81b578703f140361a5fcec96e75e5.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 5f62563f52a81b578703f140361a5fcec96e75e5 X-VCS-Branch: pending/mattst88 Date: Mon, 18 Jan 2021 19:53:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5df9e22e-b801-4c76-8a51-9fa26069cffd X-Archives-Hash: 7bdebe0d717d690df5b3c2f2b4e80778 Message-ID: <20210118195345.Tpdl5BQ9jiq2RdsbI1Hsldwl4QtjnjFsDQ-Doq4JAvY@z> commit: 5f62563f52a81b578703f140361a5fcec96e75e5 Author: Matt Turner gentoo org> AuthorDate: Tue Dec 15 03:52:40 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Dec 15 03:52:40 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5f62563f targets: Move ${buildpkgs} error checking closer Signed-off-by: Matt Turner gentoo.org> targets/stage1/chroot.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index 7e8d5b4e..83cd084d 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -5,12 +5,6 @@ source /tmp/chroot-functions.sh # We do this first, so we know our package list for --debug buildpkgs=($(/tmp/build.py)) -# Setup our environment -[ -n "${clst_BINDIST}" ] && BINDIST="bindist" -BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" - -FEATURES="${FEATURES} nodoc noman noinfo" - ## Sanity check profile if [[ ${#buildpkgs[@]} -eq 0 ]]; then echo "Your profile seems to be broken." @@ -19,6 +13,12 @@ if [[ ${#buildpkgs[@]} -eq 0 ]]; then exit 1 fi +# Setup our environment +[ -n "${clst_BINDIST}" ] && BINDIST="bindist" +BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" + +FEATURES="${FEATURES} nodoc noman noinfo" + # We need to ensure the base stage3 has USE="bindist" # if BINDIST is set to avoid issues with openssl / openssh [ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}