diff options
| author | Hauke Mehrtens | 2024-06-29 16:14:47 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2024-07-08 19:13:25 +0000 |
| commit | 9bf10898baba9c618d078bfddd37e4526a7fab61 (patch) | |
| tree | c81aa1a3ca7fc1f3d28dd5d2f841d00dce6212f3 | |
| parent | 03299b3b5237a86b64ce373bc83f73b469a728c2 (diff) | |
| download | openwrt-9bf10898baba9c618d078bfddd37e4526a7fab61.tar.gz | |
kernel: Add kmod-crypto-xxhash
kxxhash_generic.ko is a soft dependency of kmod-fs-btrfs, but we did not
package it. Extract the kmod-lib-xxhash and then package
xxhash_generic.ko.
Link: https://github.com/openwrt/openwrt/pull/15833
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 2ebeda029490e308cc0e8f475e63280f960e74c4)
Link: https://github.com/openwrt/openwrt/pull/15898
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/kernel/linux/modules/crypto.mk | 12 | ||||
| -rw-r--r-- | package/kernel/linux/modules/fs.mk | 2 | ||||
| -rw-r--r-- | package/kernel/linux/modules/lib.mk | 19 |
3 files changed, 27 insertions, 6 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 82241056a5..c6b57387cf 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -1053,3 +1053,15 @@ endef $(eval $(call KernelPackage,crypto-xts)) + +define KernelPackage/crypto-xxhash + TITLE:=xxHash non-cryptographic hash algorithm + DEPENDS:=+kmod-crypto-hash +kmod-lib-xxhash + KCONFIG:=CONFIG_CRYPTO_XXHASH + FILES:=$(LINUX_DIR)/crypto/xxhash_generic.ko + AUTOLOAD:=$(call AutoLoad,09,xxhash_generic) + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-xxhash)) + diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk index 19a78cabbb..a7fc4ce4d5 100644 --- a/package/kernel/linux/modules/fs.mk +++ b/package/kernel/linux/modules/fs.mk @@ -67,7 +67,7 @@ $(eval $(call KernelPackage,fs-autofs4)) define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support - DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b + DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd +kmod-crypto-blake2b +kmod-crypto-xxhash KCONFIG:=\ CONFIG_BTRFS_FS \ CONFIG_BTRFS_FS_CHECK_INTEGRITY=n diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk index bb92088a1d..149ce798a5 100644 --- a/package/kernel/linux/modules/lib.mk +++ b/package/kernel/linux/modules/lib.mk @@ -122,21 +122,30 @@ endef $(eval $(call KernelPackage,lib-lzo)) +define KernelPackage/lib-xxhash + SUBMENU:=$(LIB_MENU) + TITLE:=xxhash support + HIDDEN:=1 + KCONFIG:=CONFIG_XXHASH + FILES:=$(LINUX_DIR)/lib/xxhash.ko +endef + +$(eval $(call KernelPackage,lib-xxhash)) + + define KernelPackage/lib-zstd SUBMENU:=$(LIB_MENU) TITLE:=ZSTD support - DEPENDS:=+kmod-crypto-acompress + DEPENDS:=+kmod-crypto-acompress +kmod-lib-xxhash KCONFIG:= \ CONFIG_CRYPTO_ZSTD \ CONFIG_ZSTD_COMPRESS \ - CONFIG_ZSTD_DECOMPRESS \ - CONFIG_XXHASH + CONFIG_ZSTD_DECOMPRESS FILES:= \ $(LINUX_DIR)/crypto/zstd.ko \ - $(LINUX_DIR)/lib/xxhash.ko \ $(LINUX_DIR)/lib/zstd/zstd_compress.ko \ $(LINUX_DIR)/lib/zstd/zstd_decompress.ko - AUTOLOAD:=$(call AutoProbe,xxhash zstd zstd_compress zstd_decompress) + AUTOLOAD:=$(call AutoProbe,zstd zstd_compress zstd_decompress) endef define KernelPackage/lib-zstd/description |