From 7fda048b501f278483624395657e0e71458fbac1 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Thu, 25 Jun 2020 15:20:23 +0100 Subject: [PATCH] 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 --- 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 3e5a12e926..50a0ef5ad2 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:=+!LINUX_4_9:kmod-crypto-acompress - HIDDEN:=1 KCONFIG:= \ CONFIG_CRYPTO_LZ4@ge4.9 \ CONFIG_LZ4_COMPRESS \ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 0e64bb1d33..be286dfbae 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -899,15 +899,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