diff options
| author | gjb <gjb@FreeBSD.org> | 2014-09-28 20:06:02 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-09-28 20:06:02 +0000 |
| commit | 73ba8a88699ee295acc607ad755e0ae888461408 (patch) | |
| tree | c3d8201d2df85b012eb4e1db22bf8f46ac424c77 /release | |
| parent | 2aaf766ec5c79ded695251b24b986ba4e9c41fea (diff) | |
| download | FreeBSD-src-73ba8a88699ee295acc607ad755e0ae888461408.zip FreeBSD-src-73ba8a88699ee295acc607ad755e0ae888461408.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 3 | ||||
| -rwxr-xr-x | release/scripts/mk-vmimage.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index ade92ff..7fdea85 100644 --- a/release/Makefile +++ b/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 diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index 884c5a5..d33b4c0 100755 --- a/release/scripts/mk-vmimage.sh +++ b/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 || \ |
