From 07f8c9e99409eeed232294eef3c325563cc5450b Mon Sep 17 00:00:00 2001 From: Lucas Holt Date: Wed, 11 Nov 2026 15:58:25 -0500 Subject: [PATCH 1/2] release/arm: use mnbsd-ufs for the root partition in MBR images arm_create_disk() creates the root partition of MBR images (RPI, GENERICSD, RPI-B) inside a BSD label with "gpart add -t freebsd-ufs", which the MidnightBSD bsd scheme rejects with "Invalid argument"; its FFS alias is mnbsd-ufs. The GPT path already uses mnbsd-ufs. AI-Assisted-by: Claude Opus 5.5 Co-Authored-By: Claude Opus 5.5 Signed-off-by: Lucas Holt --- release/tools/arm.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index cd69f33c17e..9cd9ab483aa 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -79,7 +79,7 @@ arm_create_disk() { chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1 chroot ${CHROOTDIR} gpart add -t midnightbsd ${mddev} chroot ${CHROOTDIR} gpart create -s bsd ${mddev}s2 - chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k -b 64k ${mddev}s2 + chroot ${CHROOTDIR} gpart add -t mnbsd-ufs -a 64k -b 64k ${mddev}s2 chroot ${CHROOTDIR} newfs -U -L rootfs /dev/${mddev}s2a fi From 7581f86ec625765ef82cd1a5142dc5dee1dd2083 Mon Sep 17 00:00:00 2001 From: Lucas Holt Date: Wed, 11 Nov 2026 15:58:26 -0500 Subject: [PATCH 2/2] release.sh: do not fail when an embedded port is not installed extra_chroot_setup() builds EMBEDDEDPORTS with "make deinstall install clean distclean". Unlike the FreeBSD ports framework, mports' deinstall exits non-zero when the package is not installed, so under set -e the first build in a fresh chroot stops before anything is built. Dropping deinstall instead breaks re-runs, since mport install refuses a package that is already installed. Run deinstall as its own step and ignore its status, then install. AI-Assisted-by: Claude Opus 5.5 Co-Authored-By: Claude Opus 5.5 Signed-off-by: Lucas Holt --- release/release.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release/release.sh b/release/release.sh index 90560d2e855..23cb7ca1d03 100755 --- a/release/release.sh +++ b/release/release.sh @@ -308,9 +308,12 @@ extra_chroot_setup() { PBUILD_FLAGS="${PBUILD_FLAGS} WRKDIRPREFIX=/tmp/mports" PBUILD_FLAGS="${PBUILD_FLAGS} DISTDIR=/tmp/distfiles" for _PORT in ${EMBEDDEDPORTS}; do + # mports' deinstall fails if the package is not installed. + eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \ + /usr/mports/${_PORT} deinstall || true eval chroot ${CHROOTDIR} env ${PBUILD_FLAGS} make -C \ /usr/mports/${_PORT} \ - FORCE_PKG_REGISTER=1 deinstall install clean distclean + FORCE_PKG_REGISTER=1 install clean distclean done fi