* [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage3/
@ 2020-12-19 19:56 Matt Turner
2020-12-27 23:15 ` [gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/stage1/ Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
0 siblings, 2 replies; 3+ messages in thread
From: Matt Turner @ 2020-12-19 19:56 UTC (permalink / raw
To: gentoo-commits
commit: f229afe0e328d8d89df72097e316dadcec40aa7b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 17:35:27 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 02:56:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f229afe0
targets: Pass separate arguments to run_merge()
Signed-off-by: Matt Turner <mattst88 <AT> 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/stage1/
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage3/ Matt Turner
@ 2020-12-27 23:15 ` Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
1 sibling, 0 replies; 3+ messages in thread
From: Matt Turner @ 2020-12-27 23:15 UTC (permalink / raw
To: gentoo-commits
commit: f229afe0e328d8d89df72097e316dadcec40aa7b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 17:35:27 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 02:56:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f229afe0
targets: Pass separate arguments to run_merge()
Signed-off-by: Matt Turner <mattst88 <AT> 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage3/, targets/stage1/
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage3/ Matt Turner
2020-12-27 23:15 ` [gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/stage1/ Matt Turner
@ 2021-01-18 19:53 ` Matt Turner
1 sibling, 0 replies; 3+ messages in thread
From: Matt Turner @ 2021-01-18 19:53 UTC (permalink / raw
To: gentoo-commits
commit: f229afe0e328d8d89df72097e316dadcec40aa7b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 17:35:27 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 02:56:52 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f229afe0
targets: Pass separate arguments to run_merge()
Signed-off-by: Matt Turner <mattst88 <AT> 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-18 19:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage3/ Matt Turner
2020-12-27 23:15 ` [gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/stage1/ Matt Turner
2021-01-18 19:53 ` [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox