release/Makefile:

Include .OBJDIR in DESTDIR in the vm-base target.

release/release.sh:
  Provide the full path to mddev.

Sponsored by:	The FreeBSD Foundation

release/Makefile

@@ -318,7 +318,8 @@ install:
 vm-base:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	env IMAKE=${IMAKE} WORLDDIR=${WORLDDIR} \
-		VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} DESTDIR=${.TARGET} \
+		VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} \
+		DESTDIR=${.OBJDIR}/${.TARGET} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
 .endif

release/scripts/mk-vmimage.sh

@@ -64,7 +64,7 @@ vm_create_baseimage() {
 	truncate -s ${VMSIZE} ${VMBASE}
 	mddev=$(mdconfig -f ${VMBASE})
 	newfs -L root -j ${mddev}
-	mount ${mddev} ${DESTDIR}
+	mount /dev/${mddev} ${DESTDIR}
 	cd ${WORLDDIR} && \
 		${IMAKE} DESTDIR=${DESTDIR} \
 		installworld installkernel distribution || \