git: 9287d1853c00 - main - release: Use qemu when cross-building vm images
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 05 May 2024 06:59:40 UTC
The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9287d1853c00267a0118401530debf9c0554ff28 commit 9287d1853c00267a0118401530debf9c0554ff28 Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2024-05-05 06:59:29 +0000 release: Use qemu when cross-building vm images For a bit over 5 years, we have used qemu when cross-building cloudware images; in particular, it's necessary when installing packages which might include post-install scripts. Use qemu in the vm-images target too; while "generic" vm images don't install packages, they still run newaliases and /etc/rc.d/ldconfig, both of which fail without appropriate emulation. MFC after: 1 week --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 2565a13ef671..1124680e3191 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -157,12 +157,13 @@ CLEANFILES+= ${VMBASE}.${FS}.${FORMAT} vm-base: vm-image -vm-image: +vm-image: ${QEMUTGT} .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} . for FS in ${VMFSLIST} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ + QEMUSTATIC=${QEMUSTATIC} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \