The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1aaa8f670a0188677bd7d2ff1c83e18906715144
commit 1aaa8f670a0188677bd7d2ff1c83e18906715144 Author: John Baldwin <[email protected]> AuthorDate: 2023-06-27 03:30:45 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2023-06-27 03:30:45 +0000 nvme: Don't install nvme_private.h in /usr/include. Reviewed by: chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D40394 --- ObsoleteFiles.inc | 3 +++ include/Makefile | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index c5f19d070741..25a1ce080c39 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230626: Only install sys/dev/nvme/nvme.h to /usr/include +OLD_FILES+=usr/include/dev/nvme/nvme_private.h + # 20230623: OpenSSL 3.0.9 OLD_LIBS+=lib/libcrypto.so.111 OLD_FILES+=usr/include/openssl/rand_drbg.h diff --git a/include/Makefile b/include/Makefile index eba2675e1d1f..922337a87772 100644 --- a/include/Makefile +++ b/include/Makefile @@ -48,7 +48,7 @@ LDIRS= geom net net80211 netgraph netinet netinet6 \ LSUBDIRS= dev/acpica dev/agp dev/ciss dev/filemon dev/firewire \ dev/hwpmc dev/hyperv \ - dev/ic dev/iicbus dev/io dev/mfi dev/mmc dev/nvme \ + dev/ic dev/iicbus dev/io dev/mfi dev/mmc \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \ dev/smbus dev/speaker dev/tcp_log dev/veriexec dev/vkbd dev/wg \ fs/devfs fs/fdescfs fs/msdosfs fs/nfs fs/nullfs \ @@ -174,6 +174,10 @@ HYPERVDIR= ${INCLUDEDIR}/dev/hyperv OPENCRYPTO= cryptodev.h OPENCRYPTODIR= ${INCLUDEDIR}/crypto +.PATH: ${SRCTOP}/sys/dev/nvme +NVME= nvme.h +NVMEDIR= ${INCLUDEDIR}/dev/nvme + .PATH: ${SRCTOP}/sys/dev/pci PCI= pcireg.h PCIDIR= ${INCLUDEDIR}/dev/pci @@ -245,6 +249,7 @@ INCSGROUPS= INCS \ HID \ HYPERV \ OPENCRYPTO \ + NVME \ PCI \ RPC \ SECAUDIT \
