D40394.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40394.diff
View Options

	diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
	--- 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
	--- a/include/Makefile
	+++ b/include/Makefile
	@@ -48,7 +48,7 @@

	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 @@
	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 @@
	HID \
	HYPERV \
	OPENCRYPTO \
	+ NVME \
	PCI \
	RPC \
	SECAUDIT \