wic: Remove more conflicting du parameters

Fix builds on Ubuntu 25.10 by making sure to use parameters that are
correctly understood by core-utils and uutils. Most of these were
already removed by a previous commit, but some occurrences were missed.

Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 9c09816e5d3559c2ce2a062945e3cdb543e63e8f..8fed686e903ed0c869f337d1660da3883d8bd375 100644 (file)
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -389,7 +389,7 @@ class Partition():
         """
         Prepare content for a msdos/vfat rootfs partition.
         """
-        du_cmd = "du -bks %s" % rootfs_dir
+        du_cmd = "du --apparent-size -ks %s" % rootfs_dir
         out = exec_cmd(du_cmd)
         blocks = int(out.split()[0])
 

diff --git a/scripts/lib/wic/plugins/source/bootimg_efi.py b/scripts/lib/wic/plugins/source/bootimg_efi.py
index 99cc34454cadfda6f2bdc7a56385acbdb01197d6..430b0a4b023a514d1365518fb7364553670e54ff 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg_efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg_efi.py
@@ -389,7 +389,7 @@ class BootimgEFIPlugin(SourcePlugin):
                 out = exec_cmd(cp_cmd, True)
                 logger.debug("include_path files:\n%s" % out)
 
-        du_cmd = "du -bks %s" % hdddir
+        du_cmd = "du --apparent-size -ks %s" % hdddir
         out = exec_cmd(du_cmd)
         blocks = int(out.split()[0])
 

diff --git a/scripts/lib/wic/plugins/source/bootimg_pcbios.py b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
index 8f34c926ebbbd9745220589270b2294d8a7bff8a..a7cc5d12c620c16c396057c625fe41401b415f04 100644 (file)
--- a/scripts/lib/wic/plugins/source/bootimg_pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
@@ -273,7 +273,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
         for install_cmd in cmds:
             exec_cmd(install_cmd)
 
-        du_cmd = "du -bks %s" % hdddir
+        du_cmd = "du --apparent-size -ks %s" % hdddir
         out = exec_cmd(du_cmd)
         blocks = int(out.split()[0])
 

diff --git a/scripts/lib/wic/plugins/source/isoimage_isohybrid.py b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py
index 40018dc7eacf8c6cd654a9a8fa361818a8195a9d..fdab188db1f816857ff5a7afb681989d1c86be5a 100644 (file)
--- a/scripts/lib/wic/plugins/source/isoimage_isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py
@@ -355,7 +355,7 @@ class IsoImagePlugin(SourcePlugin):
             # Default to 100 blocks of extra space for file system overhead
             esp_extra_blocks = int(source_params.get('esp_extra_blocks', '100'))
 
-            du_cmd = "du -bks %s/EFI" % isodir
+            du_cmd = "du --apparent-size -ks %s/EFI" % isodir
             out = exec_cmd(du_cmd)
             blocks = int(out.split()[0])
             blocks += esp_extra_blocks