In release.sh, create the /dev directory within the chroot

before attempting to mount(8) devfs.  Also, create the
.OBJDIR for the 'release' target, so files end up in the
correct location.

In tools/arm.subr, fix the target device when creating the
gpart partition scheme.

Sponsored by:	The FreeBSD Foundation

2 files changed, 4 insertions, 2 deletions

diff --git a/release/release.sh b/release/release.sh
index 68d2f16..2a226e8 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -243,6 +243,7 @@ chroot_setup() {
 # extra_chroot_setup(): Prepare anything additional within the build
 # necessary for the release build.
 extra_chroot_setup() {
+	mkdir -p ${CHROOTDIR}/dev
 	mount -t devfs devfs ${CHROOTDIR}/dev
 	[ -e /etc/resolv.conf ] && cp /etc/resolv.conf \
 		${CHROOTDIR}/etc/resolv.conf
@@ -323,6 +324,7 @@ chroot_build_release() {
 # chroot_arm_armv6_build_release(): Create arm/armv6 SD card image.
 chroot_arm_armv6_build_release() {
 	load_target_env
+	eval chroot ${CHROOTDIR} make -C /usr/src/release obj
 	# XXX: In progress.
 	if [ -e "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr" ]; then
 		. "${RELENGDIR}/tools/${EMBEDDED_TARGET}.subr"
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 66b02da..67ba25e 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -64,8 +64,8 @@ umount_loop() {
 
 arm_create_disk() {
 	# Create the target raw file and temporary work directory.
-	gpart create -s ${PART_SCHEME} ${IMGBASE}
-	gpart add -t '\!12' -a 63 -s ${FAT_SIZE} ${mddev}
+	gpart create -s ${PART_SCHEME} ${mddev}
+	gpart add -t '!12' -a 63 -s ${FAT_SIZE} ${mddev}
 	gpart set -a active -i 1 ${mddev}
 	newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1
 	gpart add -t freebsd ${mddev}