From nobody Tue Nov 05 04:23:59 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 4XjFb33M0bz5d0gF; Tue, 05 Nov 2024 04:23:59 +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 4XjFb32vQLz4Jcn; Tue, 5 Nov 2024 04:23:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780639; 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=/pX1melMoE6X5DAdTeehotHF2nrBDd8Opzo1WWov36U=; b=MnzFdW5vMg7qj7j6ZLl0lMhRlzp+PyThI+9M0CkjLoIGXFdLsL64MxtSfUCQDU+76EYywv aeZS4C18s7tO3PDZvfhRJGRkJu1DmcXsSlJ5WV/1nmdO8rGU+2EKFDRenPdjJg7KiJKJzA oeSJyZ4Fxl8VaESAe5cFVU1JTJVJQxEoM2khy/r5SsUrbFdtHnRHNiV0SgIhmM0SQcv11O OAOMrFfcmdStNS4ui7305TfXAMzt2PI/fwhqe/OB80F0G3LBesSFyajuozUWNRx46llpbl zR+OmHiAUgmrIZ6rqjv5hyX4oFDLeZpMGmLpFfXJHM8FETqYRLcIwr317kkxGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730780639; 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=/pX1melMoE6X5DAdTeehotHF2nrBDd8Opzo1WWov36U=; b=Lg4tQaoNfwWCapRSV4+nmavtw4UsHJ/a7SZ6WUYbNas9sBTojmPCVnvOt70KR39yOAFtEb 1w1+XWma5Y9MevTp5V6t16VcZCMeL1+mI8XEUGTrf08ATccks1uGSx6eD9P3xvkeVmxli3 nEOyWRor1AU/nzbEkzxgmintHcO156fxZBc9iINJdKF/aY+RPwFCES/tWArj7McexCQ/0s EILE+WYGyUspetmXwPdnRrVxmSTwDooHwM1/Yl9qP+9nbeHpUzHc5Nfegc+fQnrFrKcein SHjU/gFILUbffH0lRCFXMIGDTweWblorrbCiu7SJ7aOdWYsvoE/AH/ngc3wh3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730780639; a=rsa-sha256; cv=none; b=KcXXBkvzCr1DfcmQGvSMzdW7rhIJYf79GVWrxvFuVCbuwrsLovWI/KeoXuA2CwfQli+pP/ JBYXBXy0eyY6qPej6QNCrBPQRU3Sr5+xJK3wW8FY4W/VlI+1fX9kMPNnYlVURhgzTmGu1w vIch654ZHSdCcIfgZUCwynx1eGMwtDgzr0JHYQQ58Nk46w8xgIHp2ehaIAjw5wDL09YaH9 yZF9VlNRitkrHGCMGwfmpsYn+Wu5JS+3nM6U+Ix9Fu89BnoiFGkSu8GxTFizUbKg9iJ3VP 1VZb3yjVCex8FUJzsz/RBi6c5fm0tyvh+7c88RW5qQzrLLnADNn/mFo9ni+jVw== 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 4XjFb32Qwqz12hP; Tue, 5 Nov 2024 04:23:59 +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 4A54NxVs066793; Tue, 5 Nov 2024 04:23:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A54Nxuv066790; Tue, 5 Nov 2024 04:23:59 GMT (envelope-from git) Date: Tue, 5 Nov 2024 04:23:59 GMT Message-Id: <202411050423.4A54Nxuv066790@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5af09f50d761 - main - include: Add required guards for dev/vmm headers 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5af09f50d761b6fbe66cc94b1ae854846dbe7e22 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5af09f50d761b6fbe66cc94b1ae854846dbe7e22 commit 5af09f50d761b6fbe66cc94b1ae854846dbe7e22 Author: Mark Johnston AuthorDate: 2024-11-05 03:12:39 +0000 Commit: Mark Johnston CommitDate: 2024-11-05 04:23:49 +0000 include: Add required guards for dev/vmm headers Reported by: Jenkins Fixes: ebd48f1e52d7 ("include: Install dev/vmm headers") --- include/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/Makefile b/include/Makefile index e0391cac87bb..16d641b42a90 100644 --- a/include/Makefile +++ b/include/Makefile @@ -52,7 +52,7 @@ LSUBDIRS= dev/acpica dev/agp dev/ciss dev/filemon dev/firewire \ dev/hwpmc dev/hyperv \ dev/ic dev/iicbus dev/io dev/mfi dev/mmc \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \ - dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/vmm dev/wg \ + dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/wg \ fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \ fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ @@ -310,6 +310,13 @@ INCS+= iconv.h LSUBDIRS+= dev/usb .endif +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" || \ + ${MACHINE_CPUARCH} == "riscv" +.if ${MK_BHYVE} != "no" +LSUBDIRS+= dev/vmm +.endif +.endif + .if ${MACHINE_CPUARCH} == "powerpc" && ${MACHINE_ARCH} != "powerpcspe" _dev_powermac_nvram= dev/powermac_nvram .endif