Date: Mon, 13 May 2024 22:24:45 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 166432191c5a - stable/14 - release: Use qemu when cross-building vm images Message-ID: <202405132224.44DMOjo1041087@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=166432191c5a46f60155a6cb14ce4c918c82be4d commit 166432191c5a46f60155a6cb14ce4c918c82be4d Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2024-05-13 22:24:28 +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 (cherry picked from commit 9287d1853c00267a0118401530debf9c0554ff28) --- release/Makefile.vm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 0eb549ec7bc2..6fd165528854 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} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405132224.44DMOjo1041087>