diff mbox series

[swugenerator,2/2] generator: Fix decompressed-size setting

Message ID 20251205081343.1541426-2-ernestas.k@iconn-networks.com
State Changes Requested
Headers show
Series [swugenerator,1/2] generator: Implement xz support | expand

Commit Message

Ernestas Kulik Dec. 5, 2025, 8:13 a.m. UTC 
Currently, when using single image in multiple handlers
(e.g. just flashing to several MTD partitions), the decompressed-size
property will only be set for the first one. Moreover, it only being set
for ubivol handlers breaks MTD flashing.
---
 swugenerator/generator.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/swugenerator/generator.py b/swugenerator/generator.py
index eb3a8f8..95f18df 100644
--- a/swugenerator/generator.py
+++ b/swugenerator/generator.py
@@ -133,14 +133,10 @@  class SWUGenerator:
                         "Cannot compress %s with %s", entry["filename"], cmd
                     )
                     sys.exit(1)
 
                 new.fullfilename = new_path
-
-                if entry.get("type") == "ubivol":
-                    entry.setdefault("properties", {}) \
-                         .update({ "decompressed-size": str(new.getsize()) })
             # compression cannot be used with delta, because it has own compressor
             elif ("type" in entry) and entry["type"] == "delta":
                 cmd = [
                     "zck",
                     "-u",
@@ -225,10 +221,13 @@  class SWUGenerator:
         entry["filename"] = new.newfilename
         if not self.nohash:
             entry["sha256"] = new.getsha256()
         if "encrypted" in entry and entry["encrypted"] is True:
             entry["ivt"] = new.ivt
+        if entry.get("compressed") and not self.nocompress:
+            entry.setdefault("properties", {}) \
+                 .update({ "decompressed-size": str(new.getsize()) })
 
     def find_files_in_swdesc(self, first):
         for n, val in first.items():
             if isinstance(val, libconf.AttrDict):
                 self.find_files_in_swdesc(val)