diff options
| author | gjb <gjb@FreeBSD.org> | 2014-10-01 19:13:42 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-10-01 19:13:42 +0000 |
| commit | b2b02a9be6c037b4a25a32b84407830b9c50bcb0 (patch) | |
| tree | 968fbc790b53982d760de20f9e90af7b30b3f9ea /release/Makefile | |
| parent | 78c1b9246c7c5d1207ca380a4b221d6ee25fe17b (diff) | |
| download | FreeBSD-src-b2b02a9be6c037b4a25a32b84407830b9c50bcb0.zip FreeBSD-src-b2b02a9be6c037b4a25a32b84407830b9c50bcb0.tar.gz | |
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
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/release/Makefile b/release/Makefile index 6080898..3379b81 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} |
