From nobody Wed Mar 12 21:07:03 2025 X-Original-To: dev-commits-src-main@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 4ZCjqr0mK5z5qVVj; Wed, 12 Mar 2025 21:07:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZCjqq3Wj8z3xpK; Wed, 12 Mar 2025 21:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741813623; 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=5hT6I6IYAL2ckx/KGH3AZw90bfg92npPczKRw3NmAfE=; b=sDb6yDdyVlGOj1OdcSk9R960Yii2OjGUvRhuDwNhpdHt2HgnwzL3LAatp+2iooTVwX463D iHvl2LO56IGa0QEghJeiqg6AMMfCwlVS5dTapKkzwrkwkSvnSL1/7+H42tugYLScWFLlkG JXCzMDa4R64SMj6g7yi0nhtpUrAuiwXmaojAy87ZA341JBGyUmzOILLVpqGWkUJ3YqWPw+ S8iwOMpxU5mXaGEDvZ9ID+Y3d4ggC3jxU2m42QKkqGSMqDYlBFzyDgv4GViKO8nJGlC4zZ gd2vrlp/45Htx6tLf21wI8I2WWYIFJWLyJ3a6ol5p5EDoOVlDJDYzRdmwnuvMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741813623; a=rsa-sha256; cv=none; b=idB5seqzJBUNo6oEpKlscLeMiQIGEBK6FIcSr0BvMCnzlZ91KuHXGNPo2DXN4aYS98bQtg QYj3WpaQ2Ch0SkgpS0jbpM9Ja6vtv1b3jzXiXi8sIPUCp0sA+pwUVWCWJSEn2WUfnf9hkZ cd2IR/Bs7GI84TTFfcZ+GoUH0+vM+O3cTHKsOAzRiE9tc4EN8QH5LTfKJ/URJkSNmwRc/Y JnIaes9o8fsmRIcc4c7P0/8gV5/gVvFoQAjwJvTCTIhJMUAtDpyt97ewtJpkkPHDilmcv2 LmmzFt0a8BGsySkUBYGTXocYGt/liqpz43Y2hayHP7uIAq4R8haKgVNGZ5czXQ== 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=1741813623; 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=5hT6I6IYAL2ckx/KGH3AZw90bfg92npPczKRw3NmAfE=; b=tM15gdJ4AHXP0rLLyrJLXrSj7KHkJudkilsLVkD2cuccs7gxUpkyLD6Zf3l1f38m5+x9u/ FLKetPwHPUBU7t230cOcQZ00gHazPUZVRRfTHWIpFVLOqnk0XFZk3AhJocAfGzf6VL4o+k YBRisJ0NwNtup8UXGnRE8CE1upFI5e5ryr4sboGDubKXfQb/dpWXDcluqe/KevfGvCcToC Gp7wp91ETuYIEGpnHUBAO+FQxD/v5hTFq0+D9IZ1GgjDTJBNrual/tPqESciQSkDmlNLXu 4BfQp3FIQNssZBqRRaM7L1N/vUp4zn9ydXskqV5QK56RfIqhpAVvY5UvqttODw== 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 4ZCjqq2WMBzCQ6; Wed, 12 Mar 2025 21:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52CL73ku008541; Wed, 12 Mar 2025 21:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52CL73tc008538; Wed, 12 Mar 2025 21:07:03 GMT (envelope-from git) Date: Wed, 12 Mar 2025 21:07:03 GMT Message-Id: <202503122107.52CL73tc008538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 92d399a3be0e - main - release/vm: add a WITHOUT_QEMU option List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92d399a3be0e53622b9af16a82f9b7c7b62b34f7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=92d399a3be0e53622b9af16a82f9b7c7b62b34f7 commit 92d399a3be0e53622b9af16a82f9b7c7b62b34f7 Author: Brooks Davis AuthorDate: 2025-03-12 21:05:33 +0000 Commit: Brooks Davis CommitDate: 2025-03-12 21:05:33 +0000 release/vm: add a WITHOUT_QEMU option This option disables trying to build a qemu--static and simply doesn't do any of the operations that rely on it. This disables package installation which is required by most, but not all image types. Disable all CLOUDWARE variants that require pkg when WITHOUT_QEMU is set to avoid broken images. Reviewed by: emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D49310 --- release/Makefile.vm | 9 ++++++++- release/tools/vmimage.subr | 11 +++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index ec3e734285ce..b711d7891f11 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -21,6 +21,10 @@ VMDK_DESC= VMWare, VirtualBox disk image QCOW2_DESC= Qemu, KVM disk image RAW_DESC= Unformatted raw disk image +.if defined(WITHOUT_QEMU) +CLOUDWARE_TYPES?= \ + BASIC-CI +.else CLOUDWARE_TYPES?= AZURE \ BASIC-CI \ BASIC-CLOUDINIT \ @@ -28,6 +32,7 @@ CLOUDWARE_TYPES?= AZURE \ GCE \ ORACLE \ VAGRANT +.endif AZURE_FORMAT= vhdf AZURE_FSLIST?= ufs zfs AZURE_DESC= Microsoft Azure platform image @@ -94,7 +99,7 @@ emulator-portinstall: .endif touch ${.TARGET} -.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} && !defined(WITHOUT_QEMU) .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" ) QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static QEMUTGT=emulator-portinstall @@ -120,6 +125,7 @@ cw-${_CW:tl}-${_FS}-${_FMT}: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ + WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${_FS} \ -i ${.OBJDIR}/${_CW:tl}.${_FS}.${_FMT}.img -s ${VMSIZE} -f ${_FMT} \ @@ -169,6 +175,7 @@ vm-image: ${QEMUTGT} mkdir -p ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ + WITHOUT_QEMU=${WITHOUT_QEMU:Dtrue} \ ${.CURDIR}/scripts/mk-vmimage.sh \ -C ${.CURDIR}/tools/vmimage.subr \ -d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \ diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index 7ebf2144efe4..e7bd351c035c 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -89,6 +89,9 @@ vm_install_base() { } vm_emulation_setup() { + if [ -n "${WITHOUT_QEMU}" ]; then + return 0 + fi if ! [ -z "${QEMUSTATIC}" ]; then export EMULATOR=/qemu cp ${QEMUSTATIC} ${DESTDIR}/${EMULATOR} @@ -130,6 +133,10 @@ vm_extra_enable_services() { } vm_extra_install_packages() { + if [ -n "${WITHOUT_QEMU}" ]; then + return 0 + fi + if [ -z "${VM_EXTRA_PACKAGES}" ]; then return 0 fi @@ -158,6 +165,10 @@ vm_extra_pre_umount() { } vm_emulation_cleanup() { + if [ -n "${WITHOUT_QEMU}" ]; then + return 0 + fi + if ! [ -z "${QEMUSTATIC}" ]; then rm -f ${DESTDIR}/${EMULATOR} fi