Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 3/5] targets: Move ${buildpkgs} error checking closer
Date: Wed, 16 Dec 2020 03:01:51
Message-Id: 20201216030131.14158-3-mattst88@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 1/5] targets: Rename clst_buildpkgs -> buildpkgs by Matt Turner
1 Signed-off-by: Matt Turner <mattst88@g.o>
2 ---
3 targets/stage1/chroot.sh | 12 ++++++------
4 1 file changed, 6 insertions(+), 6 deletions(-)
5
6 diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
7 index 7e8d5b4e..83cd084d 100755
8 --- a/targets/stage1/chroot.sh
9 +++ b/targets/stage1/chroot.sh
10 @@ -5,12 +5,6 @@ source /tmp/chroot-functions.sh
11 # We do this first, so we know our package list for --debug
12 buildpkgs=($(/tmp/build.py))
13
14 -# Setup our environment
15 -[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
16 -BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
17 -
18 -FEATURES="${FEATURES} nodoc noman noinfo"
19 -
20 ## Sanity check profile
21 if [[ ${#buildpkgs[@]} -eq 0 ]]; then
22 echo "Your profile seems to be broken."
23 @@ -19,6 +13,12 @@ if [[ ${#buildpkgs[@]} -eq 0 ]]; then
24 exit 1
25 fi
26
27 +# Setup our environment
28 +[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
29 +BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
30 +
31 +FEATURES="${FEATURES} nodoc noman noinfo"
32 +
33 # We need to ensure the base stage3 has USE="bindist"
34 # if BINDIST is set to avoid issues with openssl / openssh
35 [ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}
36 --
37 2.26.2