hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change path for mk-vmimage.sh from ${TARGET}/ to

Browse Source 
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
This commit is contained in:
Glen Barber 2014-11-08 16:44:45 +00:00
parent e6f3489c36
commit 26bb2a6066
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/release-vmimage/; revision=274296
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
release/Makefile.vm
View File

@ -42,39 +42,33 @@ vm-base: vm-image
vm-image: vm-image:
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) .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} mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 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} \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \ -i ${.OBJDIR}/${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
-S ${WORLDDIR} -o ${VMBASE}.${FORMAT} -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT}
. endfor . endfor
. endif
.endif .endif
touch ${.TARGET} touch ${.TARGET}
vm-cloudware: ${CLOUDTARGETS} vm-cloudware: ${CLOUDTARGETS}
vm-azure: vm-azure:
.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
mkdir -p ${.OBJDIR}/${.TARGET} mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 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} \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \ -i ${.OBJDIR}/azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
-S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF} -S ${WORLDDIR} -o ${.OBJDIR}/${AZUREIMAGE} -c ${AZURECONF}
.endif
touch ${.TARGET} touch ${.TARGET}
vm-openstack: vm-openstack:
.if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
mkdir -p ${.OBJDIR}/${.TARGET} mkdir -p ${.OBJDIR}/${.TARGET}
env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ 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} \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
-i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \ -i ${.OBJDIR}/openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
-S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF} -S ${WORLDDIR} -o ${.OBJDIR}/${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
.endif
touch ${.TARGET} touch ${.TARGET}