commit: 5f62563f52a81b578703f140361a5fcec96e75e5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:52:40 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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}