| 1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
| 2 |
--- |
| 3 |
targets/stage1/chroot.sh | 7 +++---- |
| 4 |
1 file changed, 3 insertions(+), 4 deletions(-) |
| 5 |
|
| 6 |
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh |
| 7 |
index dac52dfc..7e8d5b4e 100755 |
| 8 |
--- a/targets/stage1/chroot.sh |
| 9 |
+++ b/targets/stage1/chroot.sh |
| 10 |
@@ -3,7 +3,7 @@ |
| 11 |
source /tmp/chroot-functions.sh |
| 12 |
|
| 13 |
# We do this first, so we know our package list for --debug |
| 14 |
-buildpkgs="$(/tmp/build.py)" |
| 15 |
+buildpkgs=($(/tmp/build.py)) |
| 16 |
|
| 17 |
# Setup our environment |
| 18 |
[ -n "${clst_BINDIST}" ] && BINDIST="bindist" |
| 19 |
@@ -12,8 +12,7 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" |
| 20 |
FEATURES="${FEATURES} nodoc noman noinfo" |
| 21 |
|
| 22 |
## Sanity check profile |
| 23 |
-if [ -z "${buildpkgs}" ] |
| 24 |
-then |
| 25 |
+if [[ ${#buildpkgs[@]} -eq 0 ]]; then |
| 26 |
echo "Your profile seems to be broken." |
| 27 |
echo "Could not build a list of build packages." |
| 28 |
echo "Double check your ${clst_port_conf}/make.profile link and the 'packages' files." |
| 29 |
@@ -72,7 +71,7 @@ if [ -e ${clst_make_conf} ]; then |
| 30 |
done |
| 31 |
fi |
| 32 |
|
| 33 |
-run_merge "--oneshot ${buildpkgs}" |
| 34 |
+run_merge "--oneshot ${buildpkgs[@]}" |
| 35 |
|
| 36 |
# TODO: Drop this when locale-gen in stable glibc supports ROOT. |
| 37 |
# |
| 38 |
-- |
| 39 |
2.26.2 |
Archives