d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release/Makefile:

Browse Source 
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:
Glen Barber 2014-09-28 20:06:02 +00:00
parent 4e187d25fa
commit f54137c331
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/projects/release-vmimage/; revision=272269
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/Makefile
View File

@ -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

2
release/scripts/mk-vmimage.sh
View File

@ -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 || \