aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.vm
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-11-08 12:45:35 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-11-08 12:45:35 +0000
commit1c34bf95522f9245605fafcc9df3936f5211014e (patch)
treeffd4c805ddbc073967d083de9fdfa46e818b83d1 /release/Makefile.vm
parenta02bfc832740f019d863a87d6efe2594a4e903c8 (diff)
downloadsrc-1c34bf95522f9245605fafcc9df3936f5211014e.tar.gz
src-1c34bf95522f9245605fafcc9df3936f5211014e.zip
Fix DESTDIR for installworld, and make sure it is created
before use. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=274283
Diffstat (limited to 'release/Makefile.vm')
-rw-r--r--release/Makefile.vm9
1 files changed, 6 insertions, 3 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index 30f38682b46a..eb167defa5fc 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -44,9 +44,10 @@ vm-image:
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
. for FORMAT in ${VMFORMATS}
+ mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
${.CURDIR}/${TARGET}/mk-vmimage.sh \
- -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
-S ${WORLDDIR} -o ${VMBASE}.${FORMAT}
. endfor
@@ -58,9 +59,10 @@ vm-cloudware: ${CLOUDTARGETS}
vm-azure:
.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+ mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
${.CURDIR}/${TARGET}/mk-vmimage.sh \
- -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
-S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF}
.endif
@@ -68,9 +70,10 @@ vm-azure:
vm-openstack:
.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+ mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
${.CURDIR}/${TARGET}/mk-vmimage.sh \
- -C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
-S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
.endif