git: a3a8eabcdc9c - stable/14 - nvmecontrol: Always build instead of being conditional on WITH_NVME
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 27 Aug 2024 18:07:06 UTC
The branch stable/14 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=a3a8eabcdc9c603cbd57e4eba8b1485e03e7fd12
commit a3a8eabcdc9c603cbd57e4eba8b1485e03e7fd12
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-04-23 18:47:26 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
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