From nobody Tue Aug 27 18:07:06 2024 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 4Wtb964MpBz52ZL2; Tue, 27 Aug 2024 18:07:06 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wtb961Rh1z4Z9R; Tue, 27 Aug 2024 18:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724782026; 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=HtPsTX7BCKJ3TFlp27TIIjoC4WUu82ZN6EziEjbjZhA=; b=dBXffpqvb0Kr2l/ixdOq6gWqZFgaGTmuI89TtMNU98i4IoEiKHBN0Wwo/ug4op0OuX+3hV +rnefpaF9/iWUzExrjULoKZEsqMB+i6ZqIH5SpEBz627I+e14ITMGJzGHOcBqSp6X/pbHI m1wZ2HHLwGAXcYkdfxr5YTQA/dJZoeXNCi+lNdOrs6gLtkzD63rNJZuKVA7tbbmQYUtRd8 Z4cQKltWumnKwnGX3phqCyKwoS0pxx+MQeAmsmujxr380A/c1NJjtmQ2cTyZj2MtAjNKYW 7fO2K2k8fog9I2wB9spAfUiTKrsgIz18b5I7b/uvBwLnYKZcBdkcV1DPuU8wnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724782026; a=rsa-sha256; cv=none; b=xhdJ2PyBz+hylICu9zO813fr4mI8Xh3yzuEs1ZK4knAg5rVB6+qSKxBq22FVnlwcJJfK64 MRhcyyj1JregatwZLSJNrDDvcGICZl8Qf8tXeJIwj4XFjp8/UivUNw2ra8EXv8dn/1geOn o6L553cNxXtJ+rYaEZrA6Y9v26DX/GowSwSqLnMri0/Pm6zETVFvNoAcP51W7cXHMXpMkI iOrgAchuGxdwx1nYPV+63kZFG6RQB04vMkvOrwadVXbduAh592bI8WDtFvxWW3At+SQJYM a4++ep4AnO5A+JgYWxCHXoIYxKUsheTOHwJyHgqE5pLUGxl7cC/ErUlDYru1cA== 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=1724782026; 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=HtPsTX7BCKJ3TFlp27TIIjoC4WUu82ZN6EziEjbjZhA=; b=MR4JGfYqtQemxJRfRP1dtsgMr1nVjepYUqv9N/HpmgwBy8+apuENgw+zsCgyzy9pS1EYLn WwACWP/qG3nS3HkW3L7EPZTszMgrO42GMQpHMYLPVxxWSAZsjbgR6hel3HL2/n7Pq1bl1x lJ1y0AxzmEo0JQZgqgmwnkX5MqxkA7YmrwlnNKLYUb4F5kxgw6htsfvcLzQUkZZfQ+J/qt FRppJQDoccidb84cXt0Y9GsOOits1Yuc3WAIrocLEMEAidW0BY2rjO2Dj5eylY5kl4zsdl Vq9lhAyfrxR2aSPHoL01cR3pNBPFUaEwyjx6brfjinE7QXooazKN47KNLLw8WQ== 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 4Wtb9614Jsz10Td; Tue, 27 Aug 2024 18:07:06 +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 47RI76Vp093672; Tue, 27 Aug 2024 18:07:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RI7681093669; Tue, 27 Aug 2024 18:07:06 GMT (envelope-from git) Date: Tue, 27 Aug 2024 18:07:06 GMT Message-Id: <202408271807.47RI7681093669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a3a8eabcdc9c - stable/14 - nvmecontrol: Always build instead of being conditional on WITH_NVME 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3a8eabcdc9c603cbd57e4eba8b1485e03e7fd12 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a3a8eabcdc9c603cbd57e4eba8b1485e03e7fd12 commit a3a8eabcdc9c603cbd57e4eba8b1485e03e7fd12 Author: John Baldwin AuthorDate: 2024-04-23 18:47:26 +0000 Commit: John Baldwin CommitDate: 2024-08-27 15:54:45 +0000 nvmecontrol: Always build instead of being conditional on WITH_NVME This now builds fine on all platforms so always include it similar to other tools such as camcontrol. Reviewed by: imp, emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44842 (cherry picked from commit 2d51a9898e26c87586ba50e71b6b3fdf1591713d) --- sbin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/Makefile b/sbin/Makefile index c125075c6696..cbfff38cc626 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -52,6 +52,7 @@ SUBDIR=adjkerntz \ newfs_msdos \ nfsiod \ nos-tun \ + nvmecontrol \ pfilctl \ rcorder \ reboot \ @@ -78,7 +79,6 @@ SUBDIR.${MK_INET6}+= rtsol SUBDIR.${MK_IPFILTER}+= ipf SUBDIR.${MK_IPFW}+= ipfw SUBDIR.${MK_IPFW}+= natd -SUBDIR.${MK_NVME}+= nvmecontrol SUBDIR.${MK_OPENSSL}+= decryptcore SUBDIR.${MK_PF}+= pfctl SUBDIR.${MK_PF}+= pflogd