git: 75ae454d5814 - main - release/vm: finish fixing WITHOUT_QEMU
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Apr 2025 01:26:22 UTC
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=75ae454d58144d23672607a4a02b9b36532caf76 commit 75ae454d58144d23672607a4a02b9b36532caf76 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2025-04-07 01:24:21 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2025-04-07 01:25:57 +0000 release/vm: finish fixing WITHOUT_QEMU To support common shell patterns (test -n and -z) we want WITHOUT_QEMU to be set and not empty in mk-vmimage.sh if it is defined at all in the Makefile. Fix a case I missed previously. Reported by: cperciva Fixes: e6e5cd297ab4 ("release/vm: fix setting NO_ROOT and WITHOUT_QEMU") Sponsored by: DARPA, AFRL Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D49666 --- release/Makefile.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index f58c7c7fd092..3b0ae4227453 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -180,7 +180,7 @@ vm-image: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ - WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \ + ${WITHOUT_QEMU:DWITHOUT_QEMU=true} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \