Skip to content

release: fix arm embedded (board) image builds #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laffer1 merged 2 commits into from
Nov 11, 2026
+5 −2
Merged

release: fix arm embedded (board) image builds #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07f8c9e
release/arm: use mnbsd-ufs for the root partition in MBR images
laffer1 Nov 11, 2026
7581f86
release.sh: do not fail when an embedded port is not installed
laffer1 Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion release/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion release/tools/arm.subr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading