commit: 61b5f3ff6496da0637be28360e822496903e0a8a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 7 04:51:21 2026 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 7 04:51:21 2026 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=61b5f3ff
Wire up steve
Signed-off-by: Sam James <sam <AT> gentoo.org>
builders/dola/binhost-update | 2 +-
builders/dola/gnome-23/portage/make.conf | 4 +++-
builders/dola/kde-23/portage/make.conf | 4 +++-
builders/dola/server-23/portage/make.conf | 4 +++-
builders/milou/binhost-update | 2 +-
builders/milou/gnome-23/portage/make.conf | 2 ++
builders/milou/kde-23/portage/make.conf | 2 ++
builders/milou/openrc-23/portage/make.conf | 2 ++
builders/milou/server-23/portage/make.conf | 2 ++
builders/tintin/binhost-update | 2 +-
builders/tintin/gnome-v3-23/portage/make.conf | 2 ++
builders/tintin/kde-v3-23/portage/make.conf | 2 ++
builders/tintin/openrc-v3-23/portage/make.conf | 2 ++
builders/tintin/server-v3-23/portage/make.conf | 2 ++
14 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/builders/dola/binhost-update b/builders/dola/binhost-update
index 66d256c..062d172 100755
--- a/builders/dola/binhost-update
+++ b/builders/dola/binhost-update
@@ -96,7 +96,7 @@ emerge --sync -q &>> ${TMPFILE}
anyfail=0
-nspawn_command=(systemd-nspawn --bind /var/cache/distfiles --bind-ro
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
+nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --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/portage/make.conf
b/builders/dola/gnome-23/portage/make.conf
index e4ac952..40d4575 100644
--- a/builders/dola/gnome-23/portage/make.conf
+++ b/builders/dola/gnome-23/portage/make.conf
@@ -22,7 +22,9 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j80 --load-average 80"
+MAKEOPTS="-j80 -l80"
+NINJAOPTS="-l80"
+MAKEFLAGS="-l80 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/dola/kde-23/portage/make.conf
b/builders/dola/kde-23/portage/make.conf
index 74f3aea..ae26e5a 100644
--- a/builders/dola/kde-23/portage/make.conf
+++ b/builders/dola/kde-23/portage/make.conf
@@ -22,7 +22,9 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j80 --load-average 80"
+MAKEOPTS="-j80 -l80"
+NINJAOPTS="-l80"
+MAKEFLAGS="-l80 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/dola/server-23/portage/make.conf
b/builders/dola/server-23/portage/make.conf
index 74f3aea..ae26e5a 100644
--- a/builders/dola/server-23/portage/make.conf
+++ b/builders/dola/server-23/portage/make.conf
@@ -22,7 +22,9 @@ PKGDIR="/var/cache/binpkgs"
# Please keep this setting intact when reporting bugs.
LC_MESSAGES=C
-MAKEOPTS="-j80 --load-average 80"
+MAKEOPTS="-j80 -l80"
+NINJAOPTS="-l80"
+MAKEFLAGS="-l80 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 80 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/milou/binhost-update b/builders/milou/binhost-update
index 1d41d5c..ce3f6c3 100755
--- a/builders/milou/binhost-update
+++ b/builders/milou/binhost-update
@@ -126,7 +126,7 @@ starttime=$(date +%s)
exec {BASH_XTRACEFD}>> ${TMPFILE}
set -x
-nspawn_command=(systemd-nspawn --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
+nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --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/portage/make.conf
b/builders/milou/gnome-23/portage/make.conf
index 3079b30..5e96cdb 100644
--- a/builders/milou/gnome-23/portage/make.conf
+++ b/builders/milou/gnome-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/milou/kde-23/portage/make.conf
b/builders/milou/kde-23/portage/make.conf
index 12932a6..4cb3079 100644
--- a/builders/milou/kde-23/portage/make.conf
+++ b/builders/milou/kde-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/milou/openrc-23/portage/make.conf
b/builders/milou/openrc-23/portage/make.conf
index 12932a6..4cb3079 100644
--- a/builders/milou/openrc-23/portage/make.conf
+++ b/builders/milou/openrc-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/milou/server-23/portage/make.conf
b/builders/milou/server-23/portage/make.conf
index 12932a6..4cb3079 100644
--- a/builders/milou/server-23/portage/make.conf
+++ b/builders/milou/server-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/tintin/binhost-update b/builders/tintin/binhost-update
index f1f33f6..5cdbfc6 100755
--- a/builders/tintin/binhost-update
+++ b/builders/tintin/binhost-update
@@ -126,7 +126,7 @@ starttime=$(date +%s)
exec {BASH_XTRACEFD}>> ${TMPFILE}
set -x
-nspawn_command=(systemd-nspawn --bind /var/cache/distfiles --bind
/var/lib/machines/${NSPAWN_PKGDIR}:/var/cache/binpkgs --bind-ro
/var/db/repos/gentoo --tmpfs=/var/tmp:mode=1777,size=${TMPFS_SIZE}g)
+nspawn_command=(systemd-nspawn --bind /dev/steve --bind-ro
/etc/sandbox.d/90steve --bind /var/cache/distfiles --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/portage/make.conf
b/builders/tintin/gnome-v3-23/portage/make.conf
index 209ae0f..1e80c30 100644
--- a/builders/tintin/gnome-v3-23/portage/make.conf
+++ b/builders/tintin/gnome-v3-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/tintin/kde-v3-23/portage/make.conf
b/builders/tintin/kde-v3-23/portage/make.conf
index a87d93f..2246667 100644
--- a/builders/tintin/kde-v3-23/portage/make.conf
+++ b/builders/tintin/kde-v3-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/tintin/openrc-v3-23/portage/make.conf
b/builders/tintin/openrc-v3-23/portage/make.conf
index a87d93f..2246667 100644
--- a/builders/tintin/openrc-v3-23/portage/make.conf
+++ b/builders/tintin/openrc-v3-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
diff --git a/builders/tintin/server-v3-23/portage/make.conf
b/builders/tintin/server-v3-23/portage/make.conf
index a87d93f..2246667 100644
--- a/builders/tintin/server-v3-23/portage/make.conf
+++ b/builders/tintin/server-v3-23/portage/make.conf
@@ -23,6 +23,8 @@ PKGDIR="/var/cache/binpkgs"
LC_MESSAGES=C
MAKEOPTS="-j32 -l64"
+NINJAOPTS="-l64"
+MAKEFLAGS="-l64 --jobserver-auth=fifo:/dev/steve"
EMERGE_DEFAULT_OPTS="--jobs 20 --load-average 64 --quiet --keep-going
--binpkg-respect-use --usepkg --with-bdeps=y --color n --nospinner"
