Date: Tue, 16 Mar 2021 00:00:50 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 283352dd4f6a - main - Stop installing kernel-only crypto headers to /usr/include/crypto. Message-ID: <202103160000.12G00omA068391@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=283352dd4f6a3bb2f3c7cb45ce5dca3d86f5e3f4 commit 283352dd4f6a3bb2f3c7cb45ce5dca3d86f5e3f4 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2021-03-16 00:00:21 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2021-03-16 00:00:21 +0000 Stop installing kernel-only crypto headers to /usr/include/crypto. The only user-facing header from OCF is <crypto/cryptodev.h>. PR: 254167 (exp-run) MFC after: 1 week Sponsored by: Chelsio Communications --- ObsoleteFiles.inc | 12 ++++++++++++ include/Makefile | 16 +--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8f56ef29dad5..f111a2f83064 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,18 @@ # xargs -n1 | sort | uniq -d; # done +# 20210315: Remove kernel-only crypto headers from /usr/include +OLD_FILES+=usr/include/crypto/_cryptodev.h +OLD_FILES+=usr/include/crypto/cbc_mac.h +OLD_FILES+=usr/include/crypto/deflate.h +OLD_FILES+=usr/include/crypto/gfmult.h +OLD_FILES+=usr/include/crypto/gmac.h +OLD_FILES+=usr/include/crypto/rmd160.h +OLD_FILES+=usr/include/crypto/xform.h +OLD_FILES+=usr/include/crypto/xform_auth.h +OLD_FILES+=usr/include/crypto/xform_comp.h +OLD_FILES+=usr/include/crypto/xform_enc.h + # 20210305: removed Poly1305_* symbols OLD_FILES+=usr/include/crypto/xform_poly1305.h diff --git a/include/Makefile b/include/Makefile index 31e207f6b199..8ddfd7015918 100644 --- a/include/Makefile +++ b/include/Makefile @@ -84,10 +84,6 @@ FS9660= cd9660_mount.h \ iso_rrip.h FS9660DIR= ${INCLUDEDIR}/isofs/cd9660 -.PATH: ${SRCTOP}/sys/crypto -CRYPTO= rijndael/rijndael.h -CRYPTODIR= ${INCLUDEDIR}/crypto - .PATH: ${SRCTOP}/sys/dev/evdev EVDEV= input.h \ input-event-codes.h \ @@ -105,17 +101,7 @@ HYPERV= hv_snapshot.h \ HYPERVDIR= ${INCLUDEDIR}/dev/hyperv .PATH: ${SRCTOP}/sys/opencrypto -OPENCRYPTO= _cryptodev.h \ - cbc_mac.h \ - cryptodev.h \ - deflate.h \ - gfmult.h \ - gmac.h \ - rmd160.h \ - xform.h \ - xform_auth.h \ - xform_comp.h \ - xform_enc.h +OPENCRYPTO= cryptodev.h OPENCRYPTODIR= ${INCLUDEDIR}/crypto .PATH: ${SRCTOP}/sys/dev/pci
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103160000.12G00omA068391>