commit: 4bf458025f96a729e16ee6071614b345e38bd642
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 15:09:29 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 15:09:49 2026 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=4bf45802
Go back to regular builds
This reverts commit e0af78ea161d0bfe906d7618492d90547d5e8282.
This reverts commit 6655ae11b79c862b01be9ef3ef8936cb8812550c.
This reverts commit 20074dcca76fa1a44acec260faf19857ea5697d3.
All done with debug information seeding now.
Signed-off-by: Sam James <sam <AT> gentoo.org>
builders/dola/binhost-update | 2 +-
builders/dola/gnome-23/run-update | 12 +-----------
builders/dola/kde-23/run-update | 12 +-----------
builders/dola/server-23/run-update | 12 +-----------
builders/milou/binhost-update | 2 +-
builders/milou/gnome-23/run-update | 12 +-----------
builders/milou/kde-23/run-update | 12 +-----------
builders/milou/openrc-23/run-update | 12 +-----------
builders/milou/server-23/run-update | 12 +-----------
builders/tintin/binhost-update | 2 +-
builders/tintin/gnome-v3-23/run-update | 12 +-----------
builders/tintin/kde-v3-23/run-update | 12 +-----------
builders/tintin/openrc-v3-23/run-update | 12 +-----------
builders/tintin/server-v3-23/run-update | 12 +-----------
14 files changed, 14 insertions(+), 124 deletions(-)
diff --git a/builders/dola/binhost-update b/builders/dola/binhost-update
index 7f77fb4..e22bfbf 100755
--- a/builders/dola/binhost-update
+++ b/builders/dola/binhost-update
@@ -99,7 +99,7 @@ emerge --sync -q &>> ${TMPFILE}
anyfail=0
-nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_DEBUGDIR}:/usr/lib/debug/.tarball --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo)
+nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_DEBUGDIR}:/usr/lib/debug/.tarball --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
for n in "${NSPAWN_NAMES[@]}" ; do
machinedir=/var/lib/machines/${n}
echo Machine ${n} &>> ${TMPFILE}
diff --git a/builders/dola/gnome-23/run-update
b/builders/dola/gnome-23/run-update
index 68e2ba7..2f7fa14 100755
--- a/builders/dola/gnome-23/run-update
+++ b/builders/dola/gnome-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/dola/kde-23/run-update b/builders/dola/kde-23/run-update
index 68e2ba7..2f7fa14 100755
--- a/builders/dola/kde-23/run-update
+++ b/builders/dola/kde-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/dola/server-23/run-update
b/builders/dola/server-23/run-update
index 68e2ba7..2f7fa14 100755
--- a/builders/dola/server-23/run-update
+++ b/builders/dola/server-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index 68b95e2..f627550 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -127,7 +127,7 @@ starttime=$(date +%s)
exec {BASH_XTRACEFD}>> ${TMPFILE}
set -x
-nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_DEBUGDIR}:/usr/lib/debug/.tarball --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo)
+nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_DEBUGDIR}:/usr/lib/debug/.tarball --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
for n in "${NSPAWN_NAMES[@]}" ; do
machinedir=/var/lib/machines/${n}
echo Machine ${n} &>> ${TMPFILE}
diff --git a/builders/milou/gnome-23/run-update
b/builders/milou/gnome-23/run-update
index c02078d..862f501 100755
--- a/builders/milou/gnome-23/run-update
+++ b/builders/milou/gnome-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/kde-23/run-update b/builders/milou/kde-23/run-update
index c02078d..862f501 100755
--- a/builders/milou/kde-23/run-update
+++ b/builders/milou/kde-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/openrc-23/run-update
b/builders/milou/openrc-23/run-update
index c02078d..862f501 100755
--- a/builders/milou/openrc-23/run-update
+++ b/builders/milou/openrc-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/milou/server-23/run-update
b/builders/milou/server-23/run-update
index 68e2ba7..2f7fa14 100755
--- a/builders/milou/server-23/run-update
+++ b/builders/milou/server-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/tintin/binhost-update b/builders/tintin/binhost-update
index 8f9da6b..ed1c292 100755
--- a/builders/tintin/binhost-update
+++ b/builders/tintin/binhost-update
@@ -127,7 +127,7 @@ starttime=$(date +%s)
exec {BASH_XTRACEFD}>> ${TMPFILE}
set -x
-nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_DEBUGDIR}:/usr/lib/debug/.tarball --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo)
+nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_DEBUGDIR}:/usr/lib/debug/.tarball --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
for n in "${NSPAWN_NAMES[@]}" ; do
machinedir=/var/lib/machines/${n}
echo Machine ${n} &>> ${TMPFILE}
diff --git a/builders/tintin/gnome-v3-23/run-update
b/builders/tintin/gnome-v3-23/run-update
index c02078d..862f501 100755
--- a/builders/tintin/gnome-v3-23/run-update
+++ b/builders/tintin/gnome-v3-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/tintin/kde-v3-23/run-update
b/builders/tintin/kde-v3-23/run-update
index c02078d..862f501 100755
--- a/builders/tintin/kde-v3-23/run-update
+++ b/builders/tintin/kde-v3-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/tintin/openrc-v3-23/run-update
b/builders/tintin/openrc-v3-23/run-update
index c02078d..862f501 100755
--- a/builders/tintin/openrc-v3-23/run-update
+++ b/builders/tintin/openrc-v3-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
diff --git a/builders/tintin/server-v3-23/run-update
b/builders/tintin/server-v3-23/run-update
index 68e2ba7..2f7fa14 100755
--- a/builders/tintin/server-v3-23/run-update
+++ b/builders/tintin/server-v3-23/run-update
@@ -35,17 +35,7 @@ elif [[ $1 ]]; then
popd
fi
-for path in /var/db/pkg/*/[!-]*/NEEDED; do
- path=${path%/NEEDED}
- if read -r slot < "$path/SLOT"; then
- printf '%s:%s\n' "${path#/var/db/pkg/}" "$slot"
- else
- printf >&2 'Failed to read SLOT for %s\n' "$contents"
- fi
-done \
-| xargs -rd '\n' qatom -F '%{CATEGORY}/%{PN}:%[SLOT]' \
-| awk -F'[/:]' '$2 !~ /-bin$/' \
-| xargs -ord '\n' emerge --usepkg=n -v1 --implicit-system-deps=n "$@"
+emerge -uDN --changed-deps --backtrack=100 "${to_install[@]}"
if [[ ! $1 ]]; then
CLEAN_DELAY=0 emerge --depclean --quiet-unmerge-warn
