kernel: add missing dependency to kmod-crypto-acompress

[openwrt/openwrt.git] / package / kernel / linux / modules / lib.mk

diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index fd7b54f2f87506b96b0b386352b56b833898226a..4f2f7b88e672143c455feb2bf65a0895a154799b 100644 (file)
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -12,6 +12,7 @@ define KernelPackage/lib-crc-ccitt
   TITLE:=CRC-CCITT support
   KCONFIG:=CONFIG_CRC_CCITT
   FILES:=$(LINUX_DIR)/lib/crc-ccitt.ko
+  AUTOLOAD:=$(call AutoProbe,crc-ccitt)
 endef
 
 define KernelPackage/lib-crc-ccitt/description
@@ -26,6 +27,7 @@ define KernelPackage/lib-crc-itu-t
   TITLE:=CRC ITU-T V.41 support
   KCONFIG:=CONFIG_CRC_ITU_T
   FILES:=$(LINUX_DIR)/lib/crc-itu-t.ko
+  AUTOLOAD:=$(call AutoProbe,crc-itu-t)
 endef
 
 define KernelPackage/lib-crc-itu-t/description
@@ -40,6 +42,7 @@ define KernelPackage/lib-crc7
   TITLE:=CRC7 support
   KCONFIG:=CONFIG_CRC7
   FILES:=$(LINUX_DIR)/lib/crc7.ko
+  AUTOLOAD:=$(call AutoProbe,crc7)
 endef
 
 define KernelPackage/lib-crc7/description
@@ -54,6 +57,7 @@ define KernelPackage/lib-crc8
   TITLE:=CRC8 support
   KCONFIG:=CONFIG_CRC8
   FILES:=$(LINUX_DIR)/lib/crc8.ko
+  AUTOLOAD:=$(call AutoProbe,crc8)
 endef
 
 define KernelPackage/lib-crc8/description
@@ -68,6 +72,7 @@ define KernelPackage/lib-crc16
   TITLE:=CRC16 support
   KCONFIG:=CONFIG_CRC16
   FILES:=$(LINUX_DIR)/lib/crc16.ko
+  AUTOLOAD:=$(call AutoLoad,20,crc16,1)
 endef
 
 define KernelPackage/lib-crc16/description
@@ -83,6 +88,7 @@ define KernelPackage/lib-crc32c
   KCONFIG:=CONFIG_LIBCRC32C
   DEPENDS:=+kmod-crypto-crc32c
   FILES:=$(LINUX_DIR)/lib/libcrc32c.ko
+  AUTOLOAD:=$(call AutoProbe,libcrc32c)
 endef
 
 define KernelPackage/lib-crc32c/description
@@ -95,12 +101,17 @@ $(eval $(call KernelPackage,lib-crc32c))
 define KernelPackage/lib-lzo
   SUBMENU:=$(LIB_MENU)
   TITLE:=LZO support
+  DEPENDS:=+!(LINUX_3_18||LINUX_4_9):kmod-crypto-acompress
   KCONFIG:= \
+       CONFIG_CRYPTO_LZO@ge4.9 \
        CONFIG_LZO_COMPRESS \
        CONFIG_LZO_DECOMPRESS
+  HIDDEN:=1
   FILES:= \
+       $(LINUX_DIR)/crypto/lzo.ko@ge4.9 \
        $(LINUX_DIR)/lib/lzo/lzo_compress.ko \
        $(LINUX_DIR)/lib/lzo/lzo_decompress.ko
+  AUTOLOAD:=$(call AutoProbe,lzo@ge4.9 lzo_compress lzo_decompress)
 endef
 
 define KernelPackage/lib-lzo/description
@@ -110,12 +121,58 @@ endef
 $(eval $(call KernelPackage,lib-lzo))
 
 
+define KernelPackage/lib-zstd
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=ZSTD support
+  KCONFIG:= \
+       CONFIG_ZSTD_COMPRESS \
+       CONFIG_ZSTD_DECOMPRESS \
+       CONFIG_XXHASH
+  HIDDEN:=1
+  FILES:= \
+       $(LINUX_DIR)/lib/xxhash.ko \
+       $(LINUX_DIR)/lib/zstd/zstd_compress.ko \
+       $(LINUX_DIR)/lib/zstd/zstd_decompress.ko
+  AUTOLOAD:=$(call AutoProbe,xxhash zstd_compress zstd_decompress)
+endef
+
+define KernelPackage/lib-zstd/description
+ Kernel module for ZSTD compression/decompression support
+endef
+
+$(eval $(call KernelPackage,lib-zstd))
+
+
+define KernelPackage/lib-lz4
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=LZ4 support
+  DEPENDS:=+!(LINUX_3_18||LINUX_4_9):kmod-crypto-acompress
+  HIDDEN:=1
+  KCONFIG:= \
+       CONFIG_CRYPTO_LZ4@ge4.9 \
+       CONFIG_LZ4_COMPRESS \
+       CONFIG_LZ4_DECOMPRESS
+  FILES:= \
+       $(LINUX_DIR)/crypto/lz4.ko@ge4.9 \
+       $(LINUX_DIR)/lib/lz4/lz4_compress.ko \
+       $(LINUX_DIR)/lib/lz4/lz4_decompress.ko
+  AUTOLOAD:=$(call AutoProbe,lz4@ge4.9 lz4_compress lz4_decompress)
+endef
+
+define KernelPackage/lib-lz4/description
+ Kernel module for LZ4 compression/decompression support
+endef
+
+$(eval $(call KernelPackage,lib-lz4))
+
+
 define KernelPackage/lib-raid6
   SUBMENU:=$(LIB_MENU)
   TITLE:=RAID6 algorithm support
   HIDDEN:=1
   KCONFIG:=CONFIG_RAID6_PQ
   FILES:=$(LINUX_DIR)/lib/raid6/raid6_pq.ko
+  AUTOLOAD:=$(call AutoProbe,raid6_pq)
 endef
 
 define KernelPackage/lib-raid6/description
@@ -130,7 +187,15 @@ define KernelPackage/lib-xor
   TITLE:=XOR blocks algorithm support
   HIDDEN:=1
   KCONFIG:=CONFIG_XOR_BLOCKS
+ifneq ($(wildcard $(LINUX_DIR)/arch/arm/lib/xor-neon.ko),)
+  FILES:= \
+    $(LINUX_DIR)/crypto/xor.ko \
+    $(LINUX_DIR)/arch/arm/lib/xor-neon.ko
+  AUTOLOAD:=$(call AutoProbe,xor-neon xor)
+else
   FILES:=$(LINUX_DIR)/crypto/xor.ko
+  AUTOLOAD:=$(call AutoProbe,xor)
+endif
 endef
 
 define KernelPackage/lib-xor/description
@@ -152,23 +217,34 @@ SUBMENU:=$(LIB_MENU)
     $(LINUX_DIR)/lib/ts_kmp.ko \
     $(LINUX_DIR)/lib/ts_bm.ko \
     $(LINUX_DIR)/lib/ts_fsm.ko
+  AUTOLOAD:=$(call AutoProbe,ts_kmp ts_bm ts_fsm)
 endef
 
 $(eval $(call KernelPackage,lib-textsearch))
 
 
-define KernelPackage/lib-zlib
+define KernelPackage/lib-zlib-inflate
   SUBMENU:=$(LIB_MENU)
   TITLE:=Zlib support
-  KCONFIG:= \
-    CONFIG_ZLIB_DEFLATE \
-    CONFIG_ZLIB_INFLATE
-  FILES:= \
-    $(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko \
-    $(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko
+  HIDDEN:=1
+  KCONFIG:=CONFIG_ZLIB_INFLATE
+  FILES:=$(LINUX_DIR)/lib/zlib_inflate/zlib_inflate.ko
+  AUTOLOAD:=$(call AutoProbe,zlib_inflate)
+endef
+
+$(eval $(call KernelPackage,lib-zlib-inflate))
+
+
+define KernelPackage/lib-zlib-deflate
+  SUBMENU:=$(LIB_MENU)
+  TITLE:=Zlib support
+  HIDDEN:=1
+  KCONFIG:=CONFIG_ZLIB_DEFLATE
+  FILES:=$(LINUX_DIR)/lib/zlib_deflate/zlib_deflate.ko
+  AUTOLOAD:=$(call AutoProbe,zlib_deflate)
 endef
 
-$(eval $(call KernelPackage,lib-zlib))
+$(eval $(call KernelPackage,lib-zlib-deflate))
 
 
 define KernelPackage/lib-cordic
@@ -176,6 +252,7 @@ define KernelPackage/lib-cordic
   TITLE:=Cordic function support
   KCONFIG:=CONFIG_CORDIC
   FILES:=$(LINUX_DIR)/lib/cordic.ko
+  AUTOLOAD:=$(call AutoProbe,cordic)
 endef
 
 define KernelPackage/lib-cordic/description