diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2021-11-04 21:59:09 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 02:17:24 +0100 |
| commit | bd0db6017b1921c935785cdccdf0243fddf0b949 (patch) | |
| tree | 692a9e678f7b97b0ee6cf8ccc5021fbcaba15b24 /package/kernel/linux/modules/crypto.mk | |
| parent | b268ec5ff8baed74037d04a74f61c0417d931ad9 (diff) | |
| download | upstream-bd0db6017b1921c935785cdccdf0243fddf0b949.tar.gz upstream-bd0db6017b1921c935785cdccdf0243fddf0b949.tar.bz2 upstream-bd0db6017b1921c935785cdccdf0243fddf0b949.zip | |
kernel: 5.15: add new module
Add new module require in 5.15
- Changes in block module
- Changes in netfilter module (log module unified)
- Changes in fs module (mainly new depends for cifs and new ntfs3 module)
- Changes in lib add shared lib now used by more than 1 kmod
- Changes in crypto, dropped one crypto algo added arm crypto accellerator
- Changes in other, add zram default compressor choice and missing lib
by tpm module
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Diffstat (limited to 'package/kernel/linux/modules/crypto.mk')
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 4097957277..6fd53f6080 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -451,9 +451,7 @@ define KernelPackage/crypto-lib-blake2s TITLE:=BLAKE2s hash function library KCONFIG:=CONFIG_CRYPTO_LIB_BLAKE2S HIDDEN:=1 - FILES:= \ - $(LINUX_DIR)/lib/crypto/libblake2s.ko \ - $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko + FILES:=$(LINUX_DIR)/lib/crypto/libblake2s.ko $(call AddDepends/crypto,+PACKAGE_kmod-crypto-hash:kmod-crypto-hash) endef @@ -463,9 +461,30 @@ endef define KernelPackage/crypto-lib-blake2s/x86/64 KCONFIG+=CONFIG_CRYPTO_BLAKE2S_X86 - FILES+=$(LINUX_DIR)/arch/x86/crypto/blake2s-x86_64.ko + FILES+=\ + $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko \ + $(LINUX_DIR)/arch/x86/crypto/blake2s-x86_64.ko +endef + +define KernelPackage/crypto-lib-blake2s/arm + KCONFIG+=CONFIG_CRYPTO_BLAKE2S_ARM + FILES+=\ + $(LINUX_DIR)/lib/crypto/libblake2s-generic.ko@lt5.12 \ + $(LINUX_DIR)/arch/arm/crypto/blake2s-arm.ko@ge5.12 endef +ifndef KernelPackage/crypto-lib-blake2s/$(CRYPTO_TARGET) + define KernelPackage/crypto-lib-blake2s/$(CRYPTO_TARGET) + KCONFIG+=CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC + FILES+=$(LINUX_DIR)/lib/crypto/libblake2s-generic.ko + endef +endif + +ifdef KernelPackage/crypto-lib-blake2s/$(ARCH) + KernelPackage/crypto-lib-blake2s/$(CRYPTO_TARGET)=\ + $(KernelPackage/crypto-lib-blake2s/$(ARCH)) +endif + $(eval $(call KernelPackage,crypto-lib-blake2s)) @@ -683,7 +702,7 @@ define KernelPackage/crypto-misc CONFIG_CRYPTO_KHAZAD \ CONFIG_CRYPTO_SERPENT \ CONFIG_CRYPTO_TEA \ - CONFIG_CRYPTO_TGR192 \ + CONFIG_CRYPTO_TGR192@lt5.12 \ CONFIG_CRYPTO_TWOFISH \ CONFIG_CRYPTO_TWOFISH_COMMON \ CONFIG_CRYPTO_TWOFISH_586 \ @@ -696,7 +715,7 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/cast6_generic.ko \ $(LINUX_DIR)/crypto/khazad.ko \ $(LINUX_DIR)/crypto/tea.ko \ - $(LINUX_DIR)/crypto/tgr192.ko \ + $(LINUX_DIR)/crypto/tgr192.ko@lt5.12 \ $(LINUX_DIR)/crypto/twofish_common.ko \ $(LINUX_DIR)/crypto/wp512.ko \ $(LINUX_DIR)/crypto/twofish_generic.ko \ @@ -704,7 +723,7 @@ define KernelPackage/crypto-misc $(LINUX_DIR)/crypto/blowfish_generic.ko \ $(LINUX_DIR)/crypto/serpent_generic.ko AUTOLOAD:=$(call AutoLoad,10,anubis camellia_generic cast_common \ - cast5_generic cast6_generic khazad tea tgr192 twofish_common \ + cast5_generic cast6_generic khazad tea tgr192@lt5.12 twofish_common \ wp512 blowfish_common serpent_generic) ifndef CONFIG_TARGET_x86 AUTOLOAD+= $(call AutoLoad,10,twofish_generic blowfish_generic) |