Date: Wed, 1 Oct 2014 19:25:02 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272381 - projects/release-vmimage/release Message-ID: <201410011925.s91JP2NH060967@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Oct 1 19:25:02 2014 New Revision: 272381 URL: https://svnweb.freebsd.org/changeset/base/272381 Log: After evaluating WITH_VMIMAGES is non-empty, ensure the mk-vmimage.sh script exists before running it. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile Modified: projects/release-vmimage/release/Makefile ============================================================================== --- projects/release-vmimage/release/Makefile Wed Oct 1 19:13:42 2014 (r272380) +++ projects/release-vmimage/release/Makefile Wed Oct 1 19:25:02 2014 (r272381) @@ -317,18 +317,22 @@ install: vm-base: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) +. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \ ${VMBASE}.img ${WORLDDIR} ${.OBJDIR}/${.TARGET} ${VMSIZE} +. endif .endif touch ${.TARGET} vm-image: vm-base .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) -. for FORMAT in ${VMFORMATS} +. if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh) +. for FORMAT in ${VMFORMATS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/${TARGET}/mk-vmimage.sh ${.TARGET} \ ${VMBASE}.img ${FORMAT} ${VMBASE}.${FORMAT} -. endfor +. endfor +. endif .endif touch ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410011925.s91JP2NH060967>