commit: 4c5c664960f62a079e88bb3e32dc868fc360da0a Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Fri Mar 13 14:19:19 2026 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Fri Mar 13 14:19:19 2026 +0000 URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=4c5c6649
dola: convert from fstab hack to an external binpkgs directory bind-mounted by nspawn Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> builders/dola/binhost-update | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/builders/dola/binhost-update b/builders/dola/binhost-update index 062d172..35a3765 100755 --- a/builders/dola/binhost-update +++ b/builders/dola/binhost-update @@ -11,6 +11,8 @@ [email protected] NSPAWN_NAMES=(binhost-arm64-kde-23 binhost-arm64-gnome-23 binhost-arm64-server-23) +NSPAWN_PKGDIR='.binhost-arm64.binpkgs' + UPLOAD_USER=arm64 UPLOAD_KEY=/root/.ssh/id_ed25519 @@ -96,7 +98,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-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} @@ -114,14 +116,14 @@ for n in "${NSPAWN_NAMES[@]}" ; do for variant in ${machinedir}/${builder}/variants/*; do [[ -d ${variant} ]] || break echo "Variant: ${variant}" &>> ${TMPFILE} - "${nspawn_command[@]}" --ephemeral --bind ${machinedir}/var/cache/binpkgs:/var/cache/binpkgs -M ${n} /root/bin/run-update ${variant##*/} &>> ${TMPFILE} + "${nspawn_command[@]}" --ephemeral -M ${n} /root/bin/run-update ${variant##*/} &>> ${TMPFILE} let "anyfail+=$?" done fi done -cp ${TMPFILE} /var/lib/machines/binhost-arm64-kde-23/var/cache/binpkgs/last-build.log -upsync_binpackages /var/lib/machines/binhost-arm64-kde-23/var/cache/binpkgs arm64/23.0/arm64 &>> ${TMPFILE} +cp ${TMPFILE} /var/lib/machines/${NSPAWN_PKGDIR}/last-build.log +upsync_binpackages /var/lib/machines/${NSPAWN_PKGDIR} arm64/23.0/arm64 &>> ${TMPFILE} if [[ ${anyfail} -gt 0 ]] ; then
