From nobody Sun May 05 06:59:40 2024 X-Original-To: dev-commits-src-all@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 4VXFlc3prCz5JD67; Sun, 05 May 2024 06:59:40 +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 4VXFlc3KDxz41V3; Sun, 5 May 2024 06:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714892380; 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=/PfwgTyunnFc+SlkMYx43EV07yYqtK8gEHuujHW6d9s=; b=o3/mLGhzlhWoJQwxSAgGwMZk4mYK+/Hwn7DpX/Dg7j0pbwclcHGKauMVfd3HA9EzBGS3X3 wrkUabjiEd9Sw73cYqE6ySf8ek6IbXq7CuG7VvCLPCQzqaCWM/h9e51cw4QMc6upL4rSa6 xNj78M9xPzKIE9la70WDe22goQ8hDy1wEwGjAyeaXrFDzTlp7132ciXgEY0aoThKRA+hYY QC5vl4mf3kZJn6GWyIbI11Ol2Y0GBVjLo8tAM0iTqXNbLQdQz1C5Ob0HQmUxzc0N47x9dv hyKSNalFBzdW9dRF5ejx0qyYmxR+FFffPr7sHLWZ6ebOyTkiERodvDKX0Ezx7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714892380; a=rsa-sha256; cv=none; b=TnhI7WBzJrTdEJR4ocSUTMAcgFswEHg6Hk3TnNpziDoSHCSL312H8ALw4cubOhEIlOLxaF OTqb7or8Qb0bYTNKXa3z00p9zLUZwCxvVDkhRrbk8pSEtkvs1hk7BSySlh797s9ZfHcnZK 3Fl+BI/IeaKISup0d8+BLtsGrqNkjqWMKIuOtAwS9pyLOop9hpH4x+caHBIJTqpzwsyREg veTur4jEchdpLEnsnO2e35zL+RNjkiimWAQ79Y2uXoWh+6u5j3+IOhKHK/CQcfJ8dHuhrV UvyYYsu3xtva2+rfhqFq2mo9GMlbyGl1ozNv7iaHQEEuIy7RQzBlzeHsdqhCUQ== 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=1714892380; 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=/PfwgTyunnFc+SlkMYx43EV07yYqtK8gEHuujHW6d9s=; b=bJUPtLswhE6usU4gQlJcJ/2dXx7BBOl0cLUg0rKVOXLD4KTy1Hz1Ab8Jdu6e80KyKMRL+4 v5r2cB9sgzowmO9UfP89ROkGLm+yUqjWyUIX4C+ap1TkPLRYseQJaq0sU7b+Mu5/v3NNvi flIFilx30gFuhKw9YvTdxjszNJoYgSniY2XvfqoH/4/XGwd3H8qU/dx+9+FymTQVp1SixP Uomz0IWlagY5EQ0sIy5LbbXpeOLFEvU7/wRUOzkboEVGxJqp8fojoMRIiog0emKvgcBBzd JB/ecb+aReUDlAK5yPMK2R8YoGYHGXwlPDUBAWwkcXpBKqeW6cp3XpeGp1yBqw== 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 4VXFlc2w88z13ZN; Sun, 5 May 2024 06:59:40 +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 4456xeH1035881; Sun, 5 May 2024 06:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4456xexo035878; Sun, 5 May 2024 06:59:40 GMT (envelope-from git) Date: Sun, 5 May 2024 06:59:40 GMT Message-Id: <202405050659.4456xexo035878@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 9287d1853c00 - main - release: Use qemu when cross-building vm images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 9287d1853c00267a0118401530debf9c0554ff28 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9287d1853c00267a0118401530debf9c0554ff28 commit 9287d1853c00267a0118401530debf9c0554ff28 Author: Colin Percival AuthorDate: 2024-05-05 05:31:19 +0000 Commit: Colin Percival 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} \