diff options
| author | gjb <gjb@FreeBSD.org> | 2014-11-08 12:45:35 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-11-08 12:45:35 +0000 |
| commit | 1da292027f8e035f0aa318f919fa9dff0c0dcd14 (patch) | |
| tree | ffd4c805ddbc073967d083de9fdfa46e818b83d1 /release/Makefile.vm | |
| parent | c424c032b8fe3123fcb4c92b4ad145fd83bd99a1 (diff) | |
| download | FreeBSD-src-1da292027f8e035f0aa318f919fa9dff0c0dcd14.zip FreeBSD-src-1da292027f8e035f0aa318f919fa9dff0c0dcd14.tar.gz | |
Fix DESTDIR for installworld, and make sure it is created
before use.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/Makefile.vm')
| -rw-r--r-- | release/Makefile.vm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm index 30f3868..eb167de 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 |
