aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-10-01 19:13:42 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-10-01 19:13:42 +0000
commit0bc9be5e7435fb486faadedb649a2e7913efcfc5 (patch)
tree968fbc790b53982d760de20f9e90af7b30b3f9ea /release/Makefile
parentfadf2a24feb64564f71961a632b9fbeb6c298d15 (diff)
downloadsrc-0bc9be5e7435fb486faadedb649a2e7913efcfc5.tar.gz
src-0bc9be5e7435fb486faadedb649a2e7913efcfc5.zip
Avoid using env(1) to set values passed to mk-vmimage.sh,
and instead pass the values as arguments to the script, making it easier to run this by hand, without 'make release'. Add usage_vm_base() and usage_vm_image() usage helpers. Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-vmimage/; revision=272380
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile
index 6080898330b4..3379b81de584 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -317,20 +317,18 @@ install:
vm-base:
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
- env IMAKE=${IMAKE} WORLDDIR=${WORLDDIR} \
- VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} \
- DESTDIR=${.OBJDIR}/${.TARGET} \
- TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET}
+ env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
+ ${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE}
.endif
touch ${.TARGET}
vm-image: vm-base
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
. for FORMAT in ${VMFORMATS}
- env FORMAT=${FORMAT} VMIMAGE=${VMBASE}.${FORMAT} VMBASE=${VMBASE}.img \
- TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
- ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET}
+ env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
+ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \
+ ${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT}
. endfor
.endif
touch ${.TARGET}