aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-11-08 16:44:45 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-11-08 16:44:45 +0000
commit26bb2a6066639c76eeee9b32509dae17250d69da (patch)
tree1cf6146276a47d82618ab76e3fa33a3195c03a55 /release
parente6f3489c367f9bd0e9a6d58364eb1c2bcba38af1 (diff)
downloadsrc-26bb2a6066639c76eeee9b32509dae17250d69da.tar.gz
src-26bb2a6066639c76eeee9b32509dae17250d69da.zip
Change path for mk-vmimage.sh from ${TARGET}/ to
scripts/ now that it is consolidated into one file. Fix paths for the base image and output disk image files. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=274296
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.vm28
1 files changed, 11 insertions, 17 deletions
diff --git a/release/Makefile.vm b/release/Makefile.vm
index eb167defa5fc..d7fc18f941d8 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -42,39 +42,33 @@ vm-base: vm-image
vm-image:
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
-. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
-. for FORMAT in ${VMFORMATS}
+. for FORMAT in ${VMFORMATS}
mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/${TARGET}/mk-vmimage.sh \
+ ${.CURDIR}/scripts/mk-vmimage.sh \
-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
- -i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
- -S ${WORLDDIR} -o ${VMBASE}.${FORMAT}
-. endfor
-. endif
+ -i ${.OBJDIR}/${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
+ -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT}
+. endfor
.endif
touch ${.TARGET}
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 \
+ ${.CURDIR}/scripts/mk-vmimage.sh \
-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
- -i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
- -S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF}
-.endif
+ -i ${.OBJDIR}/azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
+ -S ${WORLDDIR} -o ${.OBJDIR}/${AZUREIMAGE} -c ${AZURECONF}
touch ${.TARGET}
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 \
+ ${.CURDIR}/scripts/mk-vmimage.sh \
-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
- -i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
- -S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
-.endif
+ -i ${.OBJDIR}/openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
+ -S ${WORLDDIR} -o ${.OBJDIR}/${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
touch ${.TARGET}