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
This commit is contained in:
parent
4e187d25fa
commit
f54137c331
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/release-vmimage/; revision=272269
@ -318,7 +318,8 @@ install:
|
|||||||
vm-base:
|
vm-base:
|
||||||
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
|
.if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
|
||||||
env IMAKE=${IMAKE} WORLDDIR=${WORLDDIR} \
|
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} \
|
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
|
||||||
${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
|
${.CURDIR}/scripts/mk-vmimage.sh ${.TARGET}
|
||||||
.endif
|
.endif
|
||||||
|
@ -64,7 +64,7 @@ vm_create_baseimage() {
|
|||||||
truncate -s ${VMSIZE} ${VMBASE}
|
truncate -s ${VMSIZE} ${VMBASE}
|
||||||
mddev=$(mdconfig -f ${VMBASE})
|
mddev=$(mdconfig -f ${VMBASE})
|
||||||
newfs -L root -j ${mddev}
|
newfs -L root -j ${mddev}
|
||||||
mount ${mddev} ${DESTDIR}
|
mount /dev/${mddev} ${DESTDIR}
|
||||||
cd ${WORLDDIR} && \
|
cd ${WORLDDIR} && \
|
||||||
${IMAKE} DESTDIR=${DESTDIR} \
|
${IMAKE} DESTDIR=${DESTDIR} \
|
||||||
installworld installkernel distribution || \
|
installworld installkernel distribution || \
|
||||||
|
Loading…
Reference in New Issue
Block a user