[openwrt/openwrt] kernel: kmod-zram: break the strict dependency from lz4

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 11 09:54:40 EDT 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/99dae00fa86203effc3e7e41cbc8d89b9518848c

commit 99dae00fa86203effc3e7e41cbc8d89b9518848c
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Thu Jun 25 15:20:23 2020 +0100

    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 at gmail.com>
---
 package/kernel/linux/modules/lib.mk   | 1 -
 package/kernel/linux/modules/other.mk | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

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



More information about the lede-commits mailing list