From nobody Sat Dec 02 00:54:52 2023 X-Original-To: dev-commits-src-branches@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 4Shs0D4kVYz52nKB; Sat, 2 Dec 2023 00:54:52 +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 4Shs0D3WZ2z3BvQ; Sat, 2 Dec 2023 00:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478492; 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=J5O0yHiY751O6Xa/UcXkRmJgN6bvX7dtE/Ropvy67O8=; b=thGx0GsJBsUgSsQmGqIvsx67rKBJs8TaK9Qv+f/herddE7xoHw7mgg8p/3eZp0AfWM93WL RvWxbx095sig4oPlRoQL9vErZ+1JyrpEdC96XUgqkpMg0gdFzpkudFSM1fwaZF64K1VRDW 6JUYHUfMEqNJG+2UNxwPeMTXbUNDqOGSCmAyiv/jVfHDGskEQsbfODMoP558u3CibASeBn URpgSpRl7Z3U4sa58LEecqW/7/cylqDDWD9M+5PIel17tOdnwSoWotYVXOSYUz28W0hNFi Uy7fyeV3x/B8N6xZM81TZ0SVQ5Bi30iZAdYFpFU+xj5AsunWewG7XVN2NHKISg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478492; 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=J5O0yHiY751O6Xa/UcXkRmJgN6bvX7dtE/Ropvy67O8=; b=RC2ybtX8qTQertQm1E/VTgmpHZh34FM/wYhrDVXMgNTH3c63ZVHM6Guj9mtaCDU37qVOKg yhcESjr96/WybQF0J0+qhYnqoTWaZrJGDXPRWr6akJT+3dfDXOzy49WCMJlOYw0fZahrUM 00JiEe54xPw+2F7BeLoOeqzy7CX8rJKn3so8CBLC+Rsn8L1sOnKERuYPrXY6UQ9IIJhUoJ VVEvKWekmwtIUQ5YzshZG9aufG47RgG7aLbGITygR5vdCOjly8ntt8raNKIYGYAN3ewDSv PjKdCtD/I24VwmUlUi0LudD4+4hSHPgvPMDPtFWAYfFYatw/x/bXAFeaBetc2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478492; a=rsa-sha256; cv=none; b=trXla7lXuKM2wSxsmKJ+dpVoVwnBghf0maXmCRvpTrOM7Fpq4tjjHjzGASB9ZK3D418U32 5mJyu/xE2uTHfmppJIE4+IB9A+ktISUv3fyoV/Rq9RRYgVznByytfOZBar+yFmQKeHp9TB QIeXmH/vh8EODdhqO1dcjuBs0g9kfJbKsA2demna2aKOZql72s4ZRMzc7MZZUxZfT/ShKX zU34/UCAnx4gX+4zvgNc3QJVa2HtxH+QfNLcE/2pFgHE81BLT+bhU9sGi/1QNELfx+YjgN oGBBaCbtsPpUbVliHxXCACTbSzvI5ZD7EqCyAruxTfWAv4btApPZ3+FMqBUhhg== 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 4Shs0D2Y1szwHV; Sat, 2 Dec 2023 00:54:52 +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 3B20sqtr024875; Sat, 2 Dec 2023 00:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20sq8x024872; Sat, 2 Dec 2023 00:54:52 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:52 GMT Message-Id: <202312020054.3B20sq8x024872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 298dcc251b6e - stable/14 - Sort MK_HYPERV option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 298dcc251b6e075c48e96eac1aec12de9fadf1b5 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=298dcc251b6e075c48e96eac1aec12de9fadf1b5 commit 298dcc251b6e075c48e96eac1aec12de9fadf1b5 Author: Brooks Davis AuthorDate: 2023-11-09 01:08:20 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:30 +0000 Sort MK_HYPERV option Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit e70ad278f45d72a8209e61a312481910d3e03b45) --- tools/build/mk/OptionalObsoleteFiles.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 56faed2a27f3..0efe377435d1 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2462,6 +2462,16 @@ OLD_FILES+=usr/share/doc/ntp/release.html OLD_FILES+=usr/share/doc/ntp/tickadj.html .endif +.if ${MK_HYPERV} == no +OLD_FILES+=etc/devd/hyperv.conf +OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig +OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info +OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info +OLD_FILES+=usr/sbin/hv_kvp_daemon +OLD_FILES+=usr/sbin/hv_vss_daemon +OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz +.endif + .if ${MK_ICONV} == no OLD_FILES+=usr/bin/iconv OLD_FILES+=usr/bin/mkcsmapper @@ -9174,16 +9184,6 @@ OLD_FILES+=usr/share/snmp/defs/wlan_tree.def OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt .endif -.if ${MK_HYPERV} == no -OLD_FILES+=etc/devd/hyperv.conf -OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig -OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info -OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info -OLD_FILES+=usr/sbin/hv_kvp_daemon -OLD_FILES+=usr/sbin/hv_vss_daemon -OLD_FILES+=usr/share/man/man8/hv_kvp_daemon.8.gz -.endif - .if ${MK_ZONEINFO} == no OLD_FILES+=usr/share/zoneinfo/Africa/Abidjan OLD_FILES+=usr/share/zoneinfo/Africa/Accra