From nobody Tue May 14 21:38:34 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 4Vf8qZ3cGZz5L3x9; Tue, 14 May 2024 21:38:34 +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 4Vf8qZ2Vdzz4RnW; Tue, 14 May 2024 21:38:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715722714; 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=BFZ7AN90RCvb1tK0gW9f7LpNWfGz013VAPI7IAXFhYc=; b=iKb8zyh2Pk8hgRYwswI1D0p/iwd2jTuuzfygQFYt5l5YCsEmXp7pc278QUWzRjs8TPkiSp KSrwlutlFwJPupMdn5EE79gOZ6XFod4lxmmLGhjeyJB3hGta1rGkYVieOGj+/FhhY1K2KR Fu14tCcAXvva6Q5yTgA7K6EB5aED6wLFMIVfRWt+T1EPnuzM3+Dj63MiF3qh+K3igNbakK LFiYChl0b89H+r1SAu3KOEg2ZqOkd5C8HbodbIPzd4IR35gI3n81ZkXzsImOmkDOpDQ9kK NCrodoxHXcYdMEyL3wPVQDg/llUFzJVtZgnfCdew8a1l72naCySzANE0rP38ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715722714; a=rsa-sha256; cv=none; b=yVHI+Uf0XgXj9DKbVT78LzVg21stD2/muz9gjYypkDP+wRbomxbVpsRn4i6qLeBKFYrPRe VUJw+SMnU7Ls8+HQaQYeex/IquOiim0vsT+Xtdf/iwd+ydacQF/6m5tTCLD/ZX+8MKw/Q4 ZScDsTjlXg3r1GXF8tQ6d+3yOe5RSCzQJdVk9s8U19x2V5kHiAbHCfEMC1tmIXxkbu/qOb qElXqq9sEIrEU6WD+h3cH6DDZMw+U04Ap/C9d95dU6pqJWuRyzfzCOqFw9BKF/XJv2tUnI 7zDkw3tyGP08iixpg7JTEFR2SR3c8qsqrlu/KzglHN4imO4bXjKHQzpsysbhrQ== 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=1715722714; 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=BFZ7AN90RCvb1tK0gW9f7LpNWfGz013VAPI7IAXFhYc=; b=VYfYuF4bkh+WFqEEZcPciL0ZXlHGssaBrQdMZXTfLkjnhI9ohztFXO3C2DYTgHV8Tcbn9h F8BiS1PwO61v553qdsSEKEgeKmXFa/uMnlWAqOE5tjcVDQ5wzjHHIZEQ2KxECZPhaGB4GG hugvtTsCY6scTkQBHjJzhaeMHg3vLCJLso7IOBvZwAJp/A2VcgAPuCrXQBuNt9jmxKsV0x Ye5fJgnqp0Oga9ZlGx+oDqoJIsX9NdIkXXqACJW0l/NpMI9Cy6TmmPcqT5DYl+umKe2PI+ DxIhqc6FvKCjcqficQs4oqFK234k1rc2RlXW1m51tewXaEn0nC1LupspBrUxzQ== 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 4Vf8qZ206zzp6T; Tue, 14 May 2024 21:38:34 +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 44ELcYLF093895; Tue, 14 May 2024 21:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ELcYrg093892; Tue, 14 May 2024 21:38:34 GMT (envelope-from git) Date: Tue, 14 May 2024 21:38:34 GMT Message-Id: <202405142138.44ELcYrg093892@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: 1653215de8f4 - releng/14.1 - 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/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 1653215de8f4e70372b77f08150e4faef8230504 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1653215de8f4e70372b77f08150e4faef8230504 commit 1653215de8f4e70372b77f08150e4faef8230504 Author: Colin Percival AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival CommitDate: 2024-05-14 21:37:47 +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 Approved by: re (delphij) (cherry picked from commit 9287d1853c00267a0118401530debf9c0554ff28) (cherry picked from commit 166432191c5a46f60155a6cb14ce4c918c82be4d) --- 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} \