[gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/stage1/

[Andreas K. Hüttel]

commit:     f90f8a912f1ab9038279fe83780d9c6cf68f6e28
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 20 12:55:55 2026 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 20 12:55:55 2026 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f90f8a91

Revert "Make stage builds a bit more verbose in the logs"

Makes no sense, is not really helpful

This reverts commit d984d5df006b46b63c3d55ef43e3d17b6da46715.

Signed-off-by: Andreas K. Hüttel <dilfridge <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 819ca3dd..1eb884b5 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -36,9 +36,9 @@ if [ -n "${clst_update_seed}" ]; then
        if [ "${clst_update_seed}" == "yes" ]; then
                echo "Updating seed stage..."
                if [ -n "${clst_update_seed_command}" ]; then
-                       ROOT=/ run_merge --verbose --buildpkg=n 
"${clst_update_seed_command}"
+                       ROOT=/ run_merge --buildpkg=n 
"${clst_update_seed_command}"
                else
-                       ROOT=/ run_merge --verbose --buildpkg=n --update --deep 
--newuse @world
+                       ROOT=/ run_merge --buildpkg=n --update --deep --newuse 
@world
                fi
        elif [ "${clst_update_seed}" != "no" ]; then
                echo "Invalid setting for update_seed: ${clst_update_seed}"
@@ -60,7 +60,7 @@ mkdir -p "$ROOT"
 ## START BUILD
 # First, we drop in a known-good baselayout
 [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build\"" >> ${clst_make_conf}
-run_merge --verbose --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
@@ -81,7 +81,7 @@ if [ -e ${clst_make_conf} ]; then
        done
 fi
 
-run_merge --verbose --implicit-system-deps=n --oneshot "${buildpkgs[@]}"
+run_merge --implicit-system-deps=n --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 6c2bc451..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 --verbose --emptytree --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