mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
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 commitafbee98232
) (cherry picked from commit2fc640d5bc
) (cherry picked from commit283352dd4f
) (cherry picked from commit9946b2f4e0
) (cherry picked from commit7af04dff02
)
This commit is contained in:
parent
325427f71d
commit
77ffc9399d
|
@ -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
|
||||
|
|
|
@ -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) \
|
||||
|
|
Loading…
Reference in a new issue