The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2d51a9898e26c87586ba50e71b6b3fdf1591713d
commit 2d51a9898e26c87586ba50e71b6b3fdf1591713d Author: John Baldwin <j...@freebsd.org> AuthorDate: 2024-04-23 18:47:26 +0000 Commit: John Baldwin <j...@freebsd.org> CommitDate: 2024-04-23 18:47:26 +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 --- sbin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/Makefile b/sbin/Makefile index 342f385f090b..200dc9da11c8 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -51,6 +51,7 @@ SUBDIR=adjkerntz \ newfs_msdos \ nfsiod \ nos-tun \ + nvmecontrol \ pfilctl \ rcorder \ reboot \ @@ -77,7 +78,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