commit: e878f218a25f48f6678877f3b0ca4226c724adf4
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 25 20:34:21 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Tue Mar 25 22:59:43 2025 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=e878f218
Move some more emerge arguments to make.conf
For some reason we ended up passing --usepkg --keep-going in both
make.conf and individual emerge calls, which was slightly confusing and
redundant.
We also passed --changed-deps and --quiet, only in individual emerge
calls. Using --quiet is generally desirable for the sake of log purity,
so enforcing it in make.conf seems like a good idea. Similarly for
changed-deps, there's not a great reason to avoid it as we always want
to refresh binpkgs where needed.
This fixes a bit of inconsistency, as not all custom variant handling
always used --quiet.
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
builders/dola/gnome-23/portage/make.conf | 2 +-
builders/dola/gnome-23/run-update | 2 +-
builders/dola/kde-23/portage/make.conf | 2 +-
builders/dola/kde-23/run-update | 2 +-
builders/dola/server-23/portage/make.conf | 2 +-
builders/dola/server-23/run-update | 2 +-
builders/milou/gnome-23/portage/make.conf | 2 +-
builders/milou/gnome-23/portage/variants/novala/buildpkgonly | 2 +-
builders/milou/gnome-23/run-update | 2 +-
builders/milou/gnome-v3-23/portage/make.conf | 2 +-
builders/milou/gnome-v3-23/portage/variants/novala/buildpkgonly | 2 +-
builders/milou/gnome-v3-23/run-update | 2 +-
builders/milou/kde-23/portage/make.conf | 2 +-
builders/milou/kde-23/run-update | 2 +-
builders/milou/kde-v3-23/portage/make.conf | 2 +-
builders/milou/kde-v3-23/run-update | 2 +-
builders/milou/openrc-23/portage/make.conf | 2 +-
builders/milou/openrc-23/run-update | 2 +-
builders/milou/openrc-v3-23/portage/make.conf | 2 +-
builders/milou/openrc-v3-23/run-update | 2 +-
builders/milou/server-23/portage/make.conf | 2 +-
builders/milou/server-23/run-update | 2 +-
builders/milou/server-v3-23/portage/make.conf | 2 +-
builders/milou/server-v3-23/run-update | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/builders/dola/gnome-23/portage/make.conf
b/builders/dola/gnome-23/portage/make.conf
index affe604..78260fe 100644
--- a/builders/dola/gnome-23/portage/make.conf
+++ b/builders/dola/gnome-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j80 --load 160.0"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/dola/gnome-23/run-update
b/builders/dola/gnome-23/run-update
index e2eef5b..4a52635 100755
--- a/builders/dola/gnome-23/run-update
+++ b/builders/dola/gnome-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/dola/kde-23/portage/make.conf
b/builders/dola/kde-23/portage/make.conf
index 2b52511..285a1db 100644
--- a/builders/dola/kde-23/portage/make.conf
+++ b/builders/dola/kde-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j80 --load 160.0"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/dola/kde-23/run-update b/builders/dola/kde-23/run-update
index e2eef5b..4a52635 100755
--- a/builders/dola/kde-23/run-update
+++ b/builders/dola/kde-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/dola/server-23/portage/make.conf
b/builders/dola/server-23/portage/make.conf
index 2b52511..285a1db 100644
--- a/builders/dola/server-23/portage/make.conf
+++ b/builders/dola/server-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j80 --load 160.0"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 160 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/dola/server-23/run-update
b/builders/dola/server-23/run-update
index e2eef5b..4a52635 100755
--- a/builders/dola/server-23/run-update
+++ b/builders/dola/server-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/gnome-23/portage/make.conf
b/builders/milou/gnome-23/portage/make.conf
index 787eb6f..0ef6ede 100644
--- a/builders/milou/gnome-23/portage/make.conf
+++ b/builders/milou/gnome-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/gnome-23/portage/variants/novala/buildpkgonly
b/builders/milou/gnome-23/portage/variants/novala/buildpkgonly
index daeeba4..ddfd336 100755
--- a/builders/milou/gnome-23/portage/variants/novala/buildpkgonly
+++ b/builders/milou/gnome-23/portage/variants/novala/buildpkgonly
@@ -1,3 +1,3 @@
#!/bin/sh
-equery hasuse -F '$cp:$slot' vala | xargs emerge -q
+equery hasuse -F '$cp:$slot' vala | xargs emerge
diff --git a/builders/milou/gnome-23/run-update
b/builders/milou/gnome-23/run-update
index 7c0c5c7..78ba234 100755
--- a/builders/milou/gnome-23/run-update
+++ b/builders/milou/gnome-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/gnome-v3-23/portage/make.conf
b/builders/milou/gnome-v3-23/portage/make.conf
index a33e112..bf6d92f 100644
--- a/builders/milou/gnome-v3-23/portage/make.conf
+++ b/builders/milou/gnome-v3-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/gnome-v3-23/portage/variants/novala/buildpkgonly
b/builders/milou/gnome-v3-23/portage/variants/novala/buildpkgonly
index daeeba4..ddfd336 100755
--- a/builders/milou/gnome-v3-23/portage/variants/novala/buildpkgonly
+++ b/builders/milou/gnome-v3-23/portage/variants/novala/buildpkgonly
@@ -1,3 +1,3 @@
#!/bin/sh
-equery hasuse -F '$cp:$slot' vala | xargs emerge -q
+equery hasuse -F '$cp:$slot' vala | xargs emerge
diff --git a/builders/milou/gnome-v3-23/run-update
b/builders/milou/gnome-v3-23/run-update
index 7c0c5c7..78ba234 100755
--- a/builders/milou/gnome-v3-23/run-update
+++ b/builders/milou/gnome-v3-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/kde-23/portage/make.conf
b/builders/milou/kde-23/portage/make.conf
index 105f980..300fe0a 100644
--- a/builders/milou/kde-23/portage/make.conf
+++ b/builders/milou/kde-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/kde-23/run-update b/builders/milou/kde-23/run-update
index 7c0c5c7..78ba234 100755
--- a/builders/milou/kde-23/run-update
+++ b/builders/milou/kde-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/kde-v3-23/portage/make.conf
b/builders/milou/kde-v3-23/portage/make.conf
index 80e255d..efe9399 100644
--- a/builders/milou/kde-v3-23/portage/make.conf
+++ b/builders/milou/kde-v3-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/kde-v3-23/run-update
b/builders/milou/kde-v3-23/run-update
index 7c0c5c7..78ba234 100755
--- a/builders/milou/kde-v3-23/run-update
+++ b/builders/milou/kde-v3-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/openrc-23/portage/make.conf
b/builders/milou/openrc-23/portage/make.conf
index 345e775..fbe1dd7 100644
--- a/builders/milou/openrc-23/portage/make.conf
+++ b/builders/milou/openrc-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/openrc-23/run-update
b/builders/milou/openrc-23/run-update
index 7c0c5c7..78ba234 100755
--- a/builders/milou/openrc-23/run-update
+++ b/builders/milou/openrc-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/openrc-v3-23/portage/make.conf
b/builders/milou/openrc-v3-23/portage/make.conf
index 92a3aa3..dac9776 100644
--- a/builders/milou/openrc-v3-23/portage/make.conf
+++ b/builders/milou/openrc-v3-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/openrc-v3-23/run-update
b/builders/milou/openrc-v3-23/run-update
index 7c0c5c7..78ba234 100755
--- a/builders/milou/openrc-v3-23/run-update
+++ b/builders/milou/openrc-v3-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/server-23/portage/make.conf
b/builders/milou/server-23/portage/make.conf
index 105f980..300fe0a 100644
--- a/builders/milou/server-23/portage/make.conf
+++ b/builders/milou/server-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/server-23/run-update
b/builders/milou/server-23/run-update
index e2eef5b..4a52635 100755
--- a/builders/milou/server-23/run-update
+++ b/builders/milou/server-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/server-v3-23/portage/make.conf
b/builders/milou/server-v3-23/portage/make.conf
index 80e255d..efe9399 100644
--- a/builders/milou/server-v3-23/portage/make.conf
+++ b/builders/milou/server-v3-23/portage/make.conf
@@ -24,7 +24,7 @@ LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
-EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --keep-going --binpkg-respect-use
--usepkg --with-bdeps=y --color n --nospinner"
+EMERGE_DEFAULT_OPTS="--jobs 20 --load 64 --quiet --keep-going
--binpkg-respect-use --usepkg --changed-deps --with-bdeps=y --color n
--nospinner"
FEATURES="binpkg-multi-instance buildpkg compress-index -network-sandbox"
diff --git a/builders/milou/server-v3-23/run-update
b/builders/milou/server-v3-23/run-update
index e2eef5b..4a52635 100755
--- a/builders/milou/server-v3-23/run-update
+++ b/builders/milou/server-v3-23/run-update
@@ -35,7 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-emerge -uDNkq --changed-deps --backtrack=100 --keep-going "${to_install[@]}"
+emerge -uDN --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
emerge --depclean --quiet-unmerge-warn
