Date: Sun, 28 Sep 2014 20:06:02 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272269 - in projects/release-vmimage/release: . scripts Message-ID: <201409282006.s8SK62qJ035049@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sun Sep 28 20:06:02 2014 New Revision: 272269 URL: http://svnweb.freebsd.org/changeset/base/272269 Log: release/Makefile: Include .OBJDIR in DESTDIR in the vm-base target. release/release.sh: Provide the full path to mddev. Sponsored by: The FreeBSD Foundation Modified: projects/release-vmimage/release/Makefile projects/release-vmimage/release/scripts/mk-vmimage.sh Modified: projects/release-vmimage/release/Makefile ============================================================================== --- projects/release-vmimage/release/Makefile Sun Sep 28 19:55:21 2014 (r272268) +++ projects/release-vmimage/release/Makefile Sun Sep 28 20:06:02 2014 (r272269) @@ -318,7 +318,8 @@ install: vm-base: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) env IMAKE=${IMAKE} WORLDDIR=${WORLDDIR} \ - VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} DESTDIR=${.TARGET} \ + VMBASE=${VMBASE}.img VMSIZE=${VMSIZE} \ + DESTDIR=${.OBJDIR}/${.TARGET} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ ${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET} .endif Modified: projects/release-vmimage/release/scripts/mk-vmimage.sh ============================================================================== --- projects/release-vmimage/release/scripts/mk-vmimage.sh Sun Sep 28 19:55:21 2014 (r272268) +++ projects/release-vmimage/release/scripts/mk-vmimage.sh Sun Sep 28 20:06:02 2014 (r272269) @@ -64,7 +64,7 @@ vm_create_baseimage() { truncate -s ${VMSIZE} ${VMBASE} mddev=$(mdconfig -f ${VMBASE}) newfs -L root -j ${mddev} - mount ${mddev} ${DESTDIR} + mount /dev/${mddev} ${DESTDIR} cd ${WORLDDIR} && \ ${IMAKE} DESTDIR=${DESTDIR} \ installworld installkernel distribution || \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409282006.s8SK62qJ035049>