From nobody Wed Apr 10 15:19:20 2024 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 4VF61h32CHz5HHN1; Wed, 10 Apr 2024 15:19:20 +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 4VF61h1W0yz4nMl; Wed, 10 Apr 2024 15:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712762360; 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=Empl6ADoqQsNoNq1pVikO5u0cnkwHc0hDsyad3KMoaw=; b=l09yY4H4PGq82ccDipJsLyeiAUWyMr7sfwGTCbc2qJPYnkBNHlzvUIz3NHAHKRPZ+80IvQ dNEzhYLb7wWCBqAX9vcnTIRUKNAN9RgN9lBWOGzHlIS60Hhr5kKGgFlmUX9ZrHUROLyQ5Y NCNamA/qYUqRgpVVJRoQKbNFI88OYiKgkBiJM7UMsAQNET0Bl3DmsK5GEa8rPlu1Q0oA3B GDIkz95mA40k+FydxVMEwfxI3YuvM0+I5gfAMuutkjrmCZRDe8gImGGs43bhQqSPo2PpLg pdggu6qvq5RtioXHBcV4+VDMAzvoDUcZCQQvAhChEEvdhgnySBYFQxV5fgXCfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712762360; a=rsa-sha256; cv=none; b=eGHE5k89Wx7nxmZO2Z6UvrSRuSOHa2EG1BzmoJbDHsprYqExSOPPVjoAGuPrMuWWGld5vH EgXxUtaibCQqTHnf75/iKUp+por4XJypxHyzZ3MJUMzBDYAIcZQ++ZmDCDnDmfjikqNLqQ 9dJFiubRcpIDVeP4ubzViKRx+vQ2658q9BqlcHrEhOdd5AD7Wp5KdfH4MU8jr06981anyZ IRbIVGNZ7kS3nWiDeL6ofzwhvNAjllernqZh7qRg/gAJr+bhqWQe+MiQu/EAwj6SDoODb0 vj22iEO1ld4nBjvA5whK5WbUVkhOIYJu27Dov5TyISWhQaKZgjt65D7LPHDeiQ== 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=1712762360; 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=Empl6ADoqQsNoNq1pVikO5u0cnkwHc0hDsyad3KMoaw=; b=M/e8noHEmgTFDF6gDCcEGcOcEeMt/rGImLaBmibiPKMp6d5eQtrMZ5NiP8jJ7oNXRRVW6K dxQx4ilekshryEJLtpSAhscPxUuM1dsFSH8r6ecSOrW0hXSLjnZTkeaDQbYqxemhFabJw1 OiNhAOWYnsiz3OmQqursKc97tMy2zsTqYOkDuF7ZYUq4XoqjTCB1NV5JLnbeq+y1PsrLPI 3oAfjGwQw1pZPL88dFvdArw7DmDqyC/Y8LFLl8Ic7r3dSbJ4lCg8c9QWQ/e929XfMAR8pu dpm/9W0n58VzbLx/A07UaWmSM4d073HgTi3UKkN7iz9eMVofPQ03MRrExWy/LA== 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 4VF61h1750zjSJ; Wed, 10 Apr 2024 15:19:20 +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 43AFJKuP093476; Wed, 10 Apr 2024 15:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43AFJKLu093473; Wed, 10 Apr 2024 15:19:20 GMT (envelope-from git) Date: Wed, 10 Apr 2024 15:19:20 GMT Message-Id: <202404101519.43AFJKLu093473@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: 11c79f9e358d - main - arm64: Connect bhyve and libvmmapi to the build 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: Sender: dev-commits-src-main+owner@freebsd.org X-BeenThere: dev-commits-src-main@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: 11c79f9e358d725dd75d91d2ff2996fd77dc88e5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=11c79f9e358d725dd75d91d2ff2996fd77dc88e5 commit 11c79f9e358d725dd75d91d2ff2996fd77dc88e5 Author: Mark Johnston AuthorDate: 2024-04-03 17:44:29 +0000 Commit: Mark Johnston CommitDate: 2024-04-10 15:17:56 +0000 arm64: Connect bhyve and libvmmapi to the build Reviewed by: corvink, andrew, jhb, emaste MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D41742 --- lib/Makefile | 3 +++ tools/build/options/WITHOUT_BHYVE | 2 +- usr.sbin/Makefile.aarch64 | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index a3c4dd966040..cd1476a62d35 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -203,6 +203,9 @@ SUBDIR.${MK_PMC}+= libopencsd .if ${MACHINE_CPUARCH} == "amd64" SUBDIR.${MK_PMC}+= libipt +.endif + +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" SUBDIR.${MK_BHYVE}+= libvmmapi .endif diff --git a/tools/build/options/WITHOUT_BHYVE b/tools/build/options/WITHOUT_BHYVE index 44b992b5a286..5d523bc58b0a 100644 --- a/tools/build/options/WITHOUT_BHYVE +++ b/tools/build/options/WITHOUT_BHYVE @@ -2,4 +2,4 @@ Do not build or install .Xr bhyve 8 , associated utilities, and examples. .Pp -This option only affects amd64/amd64. +This option only affects amd64/amd64 and arm64/aarch64. diff --git a/usr.sbin/Makefile.aarch64 b/usr.sbin/Makefile.aarch64 index a72a085ff618..6302b6a78ef7 100644 --- a/usr.sbin/Makefile.aarch64 +++ b/usr.sbin/Makefile.aarch64 @@ -1,4 +1,6 @@ - .if ${MK_ACPI} != "no" SUBDIR+= acpi .endif +.if ${MK_BHYVE} != "no" +SUBDIR+= bhyve +.endif