From nobody Mon May 13 22:24:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VdYvL12m6z5L41Q; Mon, 13 May 2024 22:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VdYvK75kMz3yHN; Mon, 13 May 2024 22:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkGWpBp9Oj4bLqstnEdLf12hJ2wXO1eUanMkfQIMWG0=; b=i1VVDDICHwgF/8UQYb9EvBhX4GJ2T2TcsqgmHkISyEG9uylYD5ZNuMQf0/KYZiH+/wxgyY Awby7+BxHL7rk8Hi7gOQx/CbXSj1We5Hu3/8NZ09kO+m+ju/U7W5VeLNV9n4EV7bIAZPl/ Mc8g6cALDnuqAeJNh04BVn3a2Mevy2aUAfMI+29HNy/umtO+dIT+hPcSLttrPpHN3Qjeyq hfIJ0GQsVgu1/JLmmBrfDfTWG2jJ/0BFbuee8AunPuVSugz35WynLvbl02aOCbSX7yp+Lz IZH97HT3Rgv3MWbq2z9dDbRK/oem3GT43lHzYO2PUpp9JsOxJyn7m6fWg5BV9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715639086; a=rsa-sha256; cv=none; b=ektqXHXbfHkB52hrSvOYG7jhAz3Tae7wSklpNcwJT88MLJ2EA99fLPnaIoDarttsR16Dxu jcVf3ogplC15/ttHsnIPO/eY691TSeGNP6ldxIh09FrylW7jsMx+IXjQvcb9hIo3Ack1mh hT4sm0rA6K09fG/+amAFXkVBQzXV12fqQdhde/QbzyMRxrrBaCfqSEBEqd2OddlC38dqdR MTdKLmKe4j5HnlfXg52p0lYZLVIBRqjAB/64FQpqk74GKfsOlBzgbkTqtacPAIT3JxLoZa WU1jXE1S7P6BsWlGgwQC0zar0+MoZZbjjbQK+7IF300/whhx4L5ONXMldDGr9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715639086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkGWpBp9Oj4bLqstnEdLf12hJ2wXO1eUanMkfQIMWG0=; b=Bfd5x1RSCixDn2KCrtFZ3DqKL/1GZg32gAro8TggikR8uiZE4RfvTov3p/h3ngGyahk5nN dGWHX73OdXZs8CLJX7mMlLDgW5ysu025ItQOovWvSWJZv0TP8mrcEG3hAgUC1w36ObjQ3N tuKTTfr6sWAdRwLc8JTPjGT8uoLvCV0ugx2mSky/706y+uq0NouVw0Nz4rdswfurQJaub8 /v4mq6ldhZkJOkPDkZoS0vsBXY369F7b2r7nYx/+gNe14ycibWEUxYlZobO8TvGx4OiNXZ WHH49u8H9SyExnn2VlIfqbR5XLsFpaMlRGASwKZrw0Hx0/EtBK16d3/hjCfrKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VdYvK6ZgVz15bQ; Mon, 13 May 2024 22:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44DMOj3Y041090; Mon, 13 May 2024 22:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44DMOjo1041087; Mon, 13 May 2024 22:24:45 GMT (envelope-from git) Date: Mon, 13 May 2024 22:24:45 GMT Message-Id: <202405132224.44DMOjo1041087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 166432191c5a - stable/14 - release: Use qemu when cross-building vm images List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 166432191c5a46f60155a6cb14ce4c918c82be4d Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=166432191c5a46f60155a6cb14ce4c918c82be4d commit 166432191c5a46f60155a6cb14ce4c918c82be4d Author: Colin Percival AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival 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} \