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 73D6C1382C5 for ; Wed, 16 Dec 2020 03:01:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AE68E08FC; Wed, 16 Dec 2020 03:01:50 +0000 (UTC) Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) (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 3C433E08FC for ; Wed, 16 Dec 2020 03:01:49 +0000 (UTC) Received: by mail-qv1-f67.google.com with SMTP id d11so10689255qvo.11 for ; Tue, 15 Dec 2020 19:01:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xTDWlX8IBJj+pjT0VWdpKXiD3Xo3RZWbtjwW+T4pals=; b=YWldRrS5BYyxQxCLU2/K0ZYwLT2m/dbAf6k8QTZFC14MAJ+5p01ZJp9mtBIds5xsXy d6Me8mm10SaMGfRP+OyNNrEl6go/Ze6kXhC0QNKZQJmtxTvWVzjMIW6OEoFWG4359qUi pC+Imjxpax01HK731FllDEmEDqIgxxqo1C6Mbc933Q2oxtiLH7BLbe+Pv+bLJkD2L8wu tezl7N2vZ6OT7OoyNTKwjvq++9MfYKpkrGG+6IF1GPBprE0md5CE6Rl0kQ5V7e4Orho7 /pNV//nmUvAgZBVGT4/ycTJKqLhq87LuO0cbKb8saXnLdN6F2c4YKL1yP35atmwxnuoJ LD5A== X-Gm-Message-State: AOAM532r90fqefVyPS8/yv+rCv9NjLQMWX6PhqGuUbq4QF6TnJL31Tre dcnlnGcUtyxZUyKpz2jkPzmQJMkithtxYA== X-Google-Smtp-Source: ABdhPJx/bZfCM6KuVFp4ArI82sYLx3LyRByjvn+UQHfwDU0FeolFGO2SFLUo7uP23P4cJflZV2teKg== X-Received: by 2002:a0c:bd9f:: with SMTP id n31mr39675547qvg.42.1608087708302; Tue, 15 Dec 2020 19:01:48 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id x65sm404352qkc.130.2020.12.15.19.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Dec 2020 19:01:47 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 3/5] targets: Move ${buildpkgs} error checking closer Date: Tue, 15 Dec 2020 22:01:29 -0500 Message-Id: <20201216030131.14158-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201216030131.14158-1-mattst88@gentoo.org> References: <20201216030131.14158-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: b364e313-2f0d-46af-816e-ebf75e4d1fc2 X-Archives-Hash: b626c7d7dde58cb2172bcb83921e7a36 Signed-off-by: Matt Turner --- 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} -- 2.26.2