Merge pull request #3416 from balena-os/module-compression

Module compression
balena-os · Jul 19, 2024 · e5ed142 · e5ed142
2 parents eefb5c8 + fbb35d5
commit e5ed142
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 84 deletions.
diff --git a/meta-balena-common/classes/compress-kernel-modules.bbclass b/meta-balena-common/classes/compress-kernel-modules.bbclass
diff --git a/meta-balena-common/classes/image-balena.bbclass b/meta-balena-common/classes/image-balena.bbclass
@@ -69,7 +69,7 @@ init_config_json() {
 def check_for_compressed_kernel_modules(modules_dir):
     for root, dirs, files in os.walk(modules_dir, topdown=True):
         for name in files:
-            found_ko = name.endswith(".ko.gz") or name.endswith(".ko.xz")
+            found_ko = name.endswith(".ko.gz") or name.endswith(".ko.xz") or name.endswith('.ko.zst')
             if found_ko:
                 return found_ko
     return False

diff --git a/meta-balena-common/classes/kernel-balena.bbclass b/meta-balena-common/classes/kernel-balena.bbclass
@@ -150,6 +150,7 @@ BALENA_CONFIGS ?= " \
     ${RAID} \
     no_gcc_plugins \
     ${FIRMWARE_COMPRESS} \
+    ${MODULE_COMPRESS} \
     ${WIREGUARD} \
     "
 
@@ -222,6 +223,11 @@ BALENA_CONFIGS[firmware_compress] = " \
     CONFIG_FW_LOADER_COMPRESS=y \
 "
 
+MODULE_COMPRESS = "${@configure_from_version("5.13", "module_compress", "", d)}"
+BALENA_CONFIGS[module_compress] = " \
+    CONFIG_MODULE_COMPRESS_ZSTD=y \
+"
+
 WIREGUARD = "${@configure_from_version("5.10", "wireguard", "", d)}"
 BALENA_CONFIGS[wireguard] = " \
     CONFIG_WIREGUARD=m \

diff --git a/meta-balena-common/recipes-kernel/kmod/kmod_%.bbappend b/meta-balena-common/recipes-kernel/kmod/kmod_%.bbappend
@@ -0,0 +1 @@
+PACKAGECONFIG:append = " zstd"