1 |
Signed-off-by: Matt Turner <mattst88@g.o> |
2 |
--- |
3 |
targets/stage1/chroot.sh | 8 ++++---- |
4 |
targets/stage3/chroot.sh | 2 +- |
5 |
2 files changed, 5 insertions(+), 5 deletions(-) |
6 |
|
7 |
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh |
8 |
index 6b9bfb3e..33d5c3c9 100755 |
9 |
--- a/targets/stage1/chroot.sh |
10 |
+++ b/targets/stage1/chroot.sh |
11 |
@@ -33,9 +33,9 @@ if [ -n "${clst_update_seed}" ]; then |
12 |
if [ "${clst_update_seed}" == "yes" ]; then |
13 |
echo "Updating seed stage..." |
14 |
if [ -n "${clst_update_seed_command}" ]; then |
15 |
- clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
16 |
+ clst_root_path=/ run_merge --buildpkg=n "${clst_update_seed_command}" |
17 |
else |
18 |
- clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" |
19 |
+ clst_root_path=/ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc |
20 |
fi |
21 |
elif [ "${clst_update_seed}" != "no" ]; then |
22 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
23 |
@@ -55,7 +55,7 @@ make_destpath "${clst_root_path}" |
24 |
## START BUILD |
25 |
# First, we drop in a known-good baselayout |
26 |
[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf} |
27 |
-run_merge "--oneshot --nodeps sys-apps/baselayout" |
28 |
+run_merge --oneshot --nodeps sys-apps/baselayout |
29 |
sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} |
30 |
|
31 |
echo "$locales" > /etc/locale.gen |
32 |
@@ -76,7 +76,7 @@ if [ -e ${clst_make_conf} ]; then |
33 |
done |
34 |
fi |
35 |
|
36 |
-run_merge "--oneshot ${buildpkgs[@]}" |
37 |
+run_merge --oneshot "${buildpkgs[@]}" |
38 |
|
39 |
# TODO: Drop this when locale-gen in stable glibc supports ROOT. |
40 |
# |
41 |
diff --git a/targets/stage3/chroot.sh b/targets/stage3/chroot.sh |
42 |
index 37001db0..7dc1b6ea 100755 |
43 |
--- a/targets/stage3/chroot.sh |
44 |
+++ b/targets/stage3/chroot.sh |
45 |
@@ -6,7 +6,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen" |
46 |
|
47 |
echo "$locales" > /etc/locale.gen |
48 |
|
49 |
-run_merge "-e --update --deep --with-bdeps=y @system" |
50 |
+run_merge -e --update --deep --with-bdeps=y @system |
51 |
|
52 |
# Replace modified /etc/locale.gen with default |
53 |
etc-update --automode -5 |
54 |
-- |
55 |
2.26.2 |