[openwrt/openwrt] build: hide kmod-zram config unless enabled

LEDE Commits lede-commits at lists.infradead.org
Sun Oct 29 11:40:32 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/62ada26de28e6c43a957b8f186ead1f45e6a5623

commit 62ada26de28e6c43a957b8f186ead1f45e6a5623
Author: Rani Hod <rani.hod at gmail.com>
AuthorDate: Sun Oct 8 18:18:13 2023 +0300

    build: hide kmod-zram config unless enabled
    
    Currently the zram default compressor choice is displayed whether or not
    zram is activated. Since the default choice is lzo-rle, this adds a
    false dependency on kmod-lib-lzo.
    With this patch, the choice options appear only when activating zram.
    
    Signed-off-by: Rani Hod <rani.hod at gmail.com>
---
 package/kernel/linux/modules/other.mk | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk
index 055dca6818..face579472 100644
--- a/package/kernel/linux/modules/other.mk
+++ b/package/kernel/linux/modules/other.mk
@@ -1046,31 +1046,33 @@ define KernelPackage/zram/description
 endef
 
 define KernelPackage/zram/config
-  choice
-    prompt "ZRAM Default compressor"
-    default ZRAM_DEF_COMP_LZORLE
+  if PACKAGE_kmod-zram
+    choice
+      prompt "ZRAM Default compressor"
+      default ZRAM_DEF_COMP_LZORLE
 
-  config ZRAM_DEF_COMP_LZORLE
+    config ZRAM_DEF_COMP_LZORLE
             bool "lzo-rle"
             select PACKAGE_kmod-lib-lzo
 
-  config ZRAM_DEF_COMP_LZO
+    config ZRAM_DEF_COMP_LZO
             bool "lzo"
             select PACKAGE_kmod-lib-lzo
 
-  config ZRAM_DEF_COMP_LZ4
+    config ZRAM_DEF_COMP_LZ4
             bool "lz4"
             select PACKAGE_kmod-lib-lz4
 
-  config ZRAM_DEF_COMP_LZ4HC
+    config ZRAM_DEF_COMP_LZ4HC
             bool "lz4-hc"
             select PACKAGE_kmod-lib-lz4hc
 
-  config ZRAM_DEF_COMP_ZSTD
+    config ZRAM_DEF_COMP_ZSTD
             bool "zstd"
             select PACKAGE_kmod-lib-zstd
 
-  endchoice
+    endchoice
+  endif
 endef
 
 $(eval $(call KernelPackage,zram))




More information about the lede-commits mailing list