Date: Mon, 29 Mar 2021 23:24:10 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 77ffc9399dad - stable/13 - Stop installing kernel-only crypto headers to /usr/include/crypto. Message-ID: <202103292324.12TNOACF063774@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=77ffc9399dadaf5d512f3f3e4d51c30edfed2c2a commit 77ffc9399dadaf5d512f3f3e4d51c30edfed2c2a Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2021-03-16 00:00:21 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2021-03-29 23:23:36 +0000 Stop installing kernel-only crypto headers to /usr/include/crypto. The only user-facing header from OCF is <crypto/cryptodev.h>. Sponsored by: Chelsio Communications (cherry picked from commit afbee98232f41fc05fa8a5b9a8cda4c4c65ff448) (cherry picked from commit 2fc640d5bc0a17024dc1eb996ab00af42a5c6dbd) (cherry picked from commit 283352dd4f6a3bb2f3c7cb45ce5dca3d86f5e3f4) (cherry picked from commit 9946b2f4e0b478de69ebd687e2132c318a4d7c21) (cherry picked from commit 7af04dff025d98e2feff979756ecde8ef0ace390) --- ObsoleteFiles.inc | 14 ++++++++++++++ include/Makefile | 22 ++-------------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d72eebbe7de1..4fd7275fb8fa 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,20 @@ # xargs -n1 | sort | uniq -d; # done +# 20210329: 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/rijndael.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 +OLD_FILES+=usr/include/crypto/xform_poly1305.h + # 20210204: bump shared libraries which link against ncurses OLD_LIBS+=lib/libedit.so.7 OLD_LIBS+=usr/lib/libdialog.so.8 diff --git a/include/Makefile b/include/Makefile index b6eb63e5ef15..ffa0b1c01f6a 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,18 +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 \ - xform_poly1305.h +OPENCRYPTO= cryptodev.h OPENCRYPTODIR= ${INCLUDEDIR}/crypto .PATH: ${SRCTOP}/sys/dev/pci @@ -359,10 +344,7 @@ symlinks: .PHONY .META $$(printf '../../../../%s ' sys/netpfil/pf/*.h) \ ${SDESTDIR}${INCLUDEDIR}/netpfil/pf; .endif - ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ../../../sys/crypto/rijndael/rijndael.h \ - ${SDESTDIR}${INCLUDEDIR}/crypto; \ - cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ - $$(printf '../../../%s ' sys/opencrypto/*.h) \ + ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} ../../../sys/opencrypto/cryptodev.h \ ${SDESTDIR}${INCLUDEDIR}/crypto; \ cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ $$(printf '../../../%s ' sys/${MACHINE}/include/*.h) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103292324.12TNOACF063774>