From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Matt Turner <mattst88@gentoo.org>
Subject: [gentoo-catalyst] [PATCH 5/7] targets: Pass separate arguments to run_merge()
Date: Sat, 19 Dec 2020 21:28:46 -0500 [thread overview]
Message-ID: <20201220022848.249207-5-mattst88@gentoo.org> (raw)
In-Reply-To: <20201220022848.249207-1-mattst88@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
---
targets/stage1/chroot.sh | 8 ++++----
targets/stage3/chroot.sh | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 6b9bfb3e..33d5c3c9 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -33,9 +33,9 @@ if [ -n "${clst_update_seed}" ]; then
if [ "${clst_update_seed}" == "yes" ]; then
echo "Updating seed stage..."
if [ -n "${clst_update_seed_command}" ]; then
- clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}"
+ clst_root_path=/ run_merge --buildpkg=n "${clst_update_seed_command}"
else
- clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc"
+ clst_root_path=/ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc
fi
elif [ "${clst_update_seed}" != "no" ]; then
echo "Invalid setting for update_seed: ${clst_update_seed}"
@@ -55,7 +55,7 @@ make_destpath "${clst_root_path}"
## START BUILD
# First, we drop in a known-good baselayout
[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
-run_merge "--oneshot --nodeps sys-apps/baselayout"
+run_merge --oneshot --nodeps sys-apps/baselayout
sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
echo "$locales" > /etc/locale.gen
@@ -76,7 +76,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge "--oneshot ${buildpkgs[@]}"
+run_merge --oneshot "${buildpkgs[@]}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
diff --git a/targets/stage3/chroot.sh b/targets/stage3/chroot.sh
index 37001db0..7dc1b6ea 100755
--- a/targets/stage3/chroot.sh
+++ b/targets/stage3/chroot.sh
@@ -6,7 +6,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen"
echo "$locales" > /etc/locale.gen
-run_merge "-e --update --deep --with-bdeps=y @system"
+run_merge -e --update --deep --with-bdeps=y @system
# Replace modified /etc/locale.gen with default
etc-update --automode -5
--
2.26.2
next prev parent reply other threads:[~2020-12-20 2:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-20 2:28 [gentoo-catalyst] [PATCH 1/7] catalyst: Set stage_path = chroot_path + root_path Matt Turner
2020-12-20 2:28 ` [gentoo-catalyst] [PATCH 2/7] catalyst: Remove set_dest_path() Matt Turner
2020-12-20 2:28 ` [gentoo-catalyst] [PATCH 3/7] catalyst: Remove some redundant set_stage_path()s Matt Turner
2020-12-20 2:28 ` [gentoo-catalyst] [PATCH 4/7] targets: Remove EBEEP_IGNORE / EPAUSE_IGNORE Matt Turner
2020-12-20 2:28 ` Matt Turner [this message]
2020-12-20 2:28 ` [gentoo-catalyst] [PATCH 6/7] targets: Remove make_destpath() function Matt Turner
2020-12-20 2:28 ` [gentoo-catalyst] [PATCH 7/7] targets: Emerge stage1 with --implicit-system-deps=n Matt Turner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201220022848.249207-5-mattst88@gentoo.org \
--to=mattst88@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox