From nobody Wed Feb 01 17:23:51 2023 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 4P6TKg6HjWz3bH7f; Wed, 1 Feb 2023 17:23:51 +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 4P6TKg5gkWz3NQm; Wed, 1 Feb 2023 17:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272231; 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=EUGafuCkKwkDl63Cg7h3e8Y1u2fJanVM3p9l1jz76z0=; b=emaMFbu6W7HzHvIJeRjYfdbvgqaLHkBENKci7uotznfQognN2XfPaV0ybDx3Wpm8V8F+yG MGBMaIddg9E2ho9CG0Uy+9sxmuPORT4StY/OaZAv8Q90Cx5Krm3rQqi8xHqAJmIj+mMMaz SMmaMq41/N//ROOnPr+WzZwMLRUZn9ghvZYJ4l8MSM6BLntcZI2lmycrCtqAya37N/EDg1 TQL64mgbL/KNvC+cW9i0sX3J3eprwWttSxAetCMoPvbDlL+6VL/ev5iiRSbq+l9ldm8nMI MluVDuwevtTZgRw61C2T9Lotzrh8PBWHqhRhCcLAbZarB4YwI5SQsTWBSErZEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675272231; 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=EUGafuCkKwkDl63Cg7h3e8Y1u2fJanVM3p9l1jz76z0=; b=be72qrZJbs2GnxcLBUWaFNKWsBTs0mPpsaIH3dJmiizUwQaifspyb4HQxte+x2+onZTwwJ 190Da6T7Pzs+IzDTXpDjmoXj3cqufP1ULfj3i19cbBczrcEW0f7aKX+0UCLi3OKiMMAZuz 40eCmOksPUxwbj8LKYY2MmRR132+sfrSi6wyFR8oSRERF/ZmIyzoz+YmAnivmeSnyh1rKW 8/awZSPafEz1ZU+mPdMQW2k2O831iIKBcxs/9ZC2m8cUc9ZQrj3dQaWwwutYlTni1CR+zi MaPbguUUG/kd8TOzGzJeNzcrEoc6exOQt2RKMYTvEuguC/aRQbTFMeZxSmc17g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675272231; a=rsa-sha256; cv=none; b=twMQ7Po9RqdDiObj2fsOalMYxjiqH/XO5WkacAGw3BKBbLiqXdFayotuWNEOv16rF+u/m7 O8OYL7Gf6+5lbWpej4ZBkjDRys4NADgfM8I/q+YczrgG7sD04lis5Nwz9NjOARmNoEVkt8 Gma0dlClYuvO9FUW1tZoXYRraJX6IXhFs28XZ2WNukTSyef82UvCEOqMn9RSPdkHZs7xFF UfJCwf1v6/P66FC8nlUQyZdCTUx4zAUUemAf5X1yB0NL5n7yE/TQMeswwYVVCQiguFZi25 CFOvZz9Qi+oYWCv/QIcpUnQEk2n7w68OjQhQFru9o5Z+H+ycGNUFid1LKMLWRQ== 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 4P6TKg4l4RzN72; Wed, 1 Feb 2023 17:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 311HNpOl044290; Wed, 1 Feb 2023 17:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 311HNpJA044289; Wed, 1 Feb 2023 17:23:51 GMT (envelope-from git) Date: Wed, 1 Feb 2023 17:23:51 GMT Message-Id: <202302011723.311HNpJA044289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f051d72314f8 - main - hyperv: Build and install where supported 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f051d72314f8eb174fe69e62a997c9ed23ff84a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f051d72314f8eb174fe69e62a997c9ed23ff84a1 commit f051d72314f8eb174fe69e62a997c9ed23ff84a1 Author: Warner Losh AuthorDate: 2023-02-01 17:21:24 +0000 Commit: Warner Losh CommitDate: 2023-02-01 17:21:57 +0000 hyperv: Build and install where supported Remove the hard-coded dependency on HYPERV being only x86. Instead, 100% rely on MK_HYPERV. It's always right (since it's marked BROKEN (so set to "no") on architectures we don't support). Sponsored by: Netflix Reviewed by: bz Differential Revision: https://reviews.freebsd.org/D38306 --- lib/libc/x86/sys/Makefile.inc | 1 + libexec/Makefile | 5 +++++ libexec/Makefile.amd64 | 5 ----- libexec/Makefile.i386 | 5 ----- usr.sbin/Makefile | 1 + usr.sbin/Makefile.amd64 | 3 --- usr.sbin/Makefile.i386 | 3 --- 7 files changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/libc/x86/sys/Makefile.inc b/lib/libc/x86/sys/Makefile.inc index 382b52dd9065..571e01441a1b 100644 --- a/lib/libc/x86/sys/Makefile.inc +++ b/lib/libc/x86/sys/Makefile.inc @@ -10,6 +10,7 @@ SRCS+= \ MAN+= \ pkru.3 +# Note: vdso support for hyperv only on amd64 .if ${MACHINE_CPUARCH} == "amd64" && ${MK_HYPERV} != "no" CFLAGS+= -DWANT_HYPERV .endif diff --git a/libexec/Makefile b/libexec/Makefile index 8d7565fe3ee5..057bad07de5b 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -10,6 +10,7 @@ SUBDIR= ${_atf} \ ${_dma} \ flua \ getty \ + ${_hyperv} \ ${_mail.local} \ ${_makewhatis.local} \ ${_mknetid} \ @@ -64,6 +65,10 @@ _comsat= comsat _dma= dma .endif +.if ${MK_HYPERV} != "no" +_hyperv+= hyperv +.endif + .if ${MK_NIS} != "no" _mknetid= mknetid _ypxfr= ypxfr diff --git a/libexec/Makefile.amd64 b/libexec/Makefile.amd64 deleted file mode 100644 index 1092a29a2a33..000000000000 --- a/libexec/Makefile.amd64 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif diff --git a/libexec/Makefile.i386 b/libexec/Makefile.i386 deleted file mode 100644 index 1092a29a2a33..000000000000 --- a/libexec/Makefile.i386 +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 603733db9664..e2f382303d6e 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -140,6 +140,7 @@ SUBDIR.${MK_FLOPPY}+= fdwrite SUBDIR.${MK_FREEBSD_UPDATE}+= freebsd-update SUBDIR.${MK_GSSAPI}+= gssd SUBDIR.${MK_GPIO}+= gpioctl +SUBDIR.${MK_HYPERV}+= hyperv SUBDIR.${MK_INET6}+= ip6addrctl SUBDIR.${MK_INET6}+= mld6query SUBDIR.${MK_INET6}+= ndp diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index 1f15259eb1ac..1191b5d6814e 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -23,9 +23,6 @@ SUBDIR+= boot0cfg SUBDIR+= btxld .endif SUBDIR+= cpucontrol -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif SUBDIR+= lptcontrol SUBDIR+= mptable SUBDIR+= spkrtest diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index 4705fcadb36f..2941eb514900 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -12,9 +12,6 @@ SUBDIR+= boot0cfg SUBDIR+= btxld .endif SUBDIR+= cpucontrol -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif SUBDIR+= lptcontrol SUBDIR+= mptable SUBDIR+= pnpinfo