From: Rui Salvaterra <rsalvaterra@gmail.com>
Date: Thu, 25 Jun 2020 14:20:23 +0000 (+0100)
Subject: kernel: kmod-zram: break the strict dependency from lz4
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=99dae00fa86203effc3e7e41cbc8d89b9518848c;p=openwrt%2Fstaging%2Fthess.git

kernel: kmod-zram: break the strict dependency from lz4

Zram is only strictly dependent on lzo, not lz4. Break this dependency and
make the lz4 module visible in the configuration, in order for the user to
have the choice of enabling/disabling it, if (s)he sees fit.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
---

diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index e14c6b31c0..1289cc1f25 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -147,7 +147,6 @@ define KernelPackage/lib-lz4
   SUBMENU:=$(LIB_MENU)
   TITLE:=LZ4 support
   DEPENDS:=+kmod-crypto-acompress
-  HIDDEN:=1
   KCONFIG:= \
 	CONFIG_CRYPTO_LZ4 \
 	CONFIG_LZ4_COMPRESS \
diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index f74c622ed7..6eb9404837 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -930,15 +930,14 @@ $(eval $(call KernelPackage,ikconfig))
 define KernelPackage/zram
   SUBMENU:=$(OTHER_MENU)
   TITLE:=ZRAM
-  DEPENDS:=+kmod-lib-lzo +kmod-lib-lz4
+  DEPENDS:=+kmod-lib-lzo
   KCONFIG:= \
 	CONFIG_ZSMALLOC \
 	CONFIG_ZRAM \
 	CONFIG_ZRAM_DEBUG=n \
 	CONFIG_PGTABLE_MAPPING=n \
 	CONFIG_ZRAM_WRITEBACK=n \
-	CONFIG_ZSMALLOC_STAT=n \
-	CONFIG_ZRAM_LZ4_COMPRESS=y
+	CONFIG_ZSMALLOC_STAT=n
   FILES:= \
 	$(LINUX_DIR)/mm/zsmalloc.ko \
 	$(LINUX_DIR)/drivers/block/zram/zram.ko