From: Mathieu Dubois-Briand Date: Tue, 9 Dec 2025 15:48:02 +0000 (+0100) Subject: wic: Remove more conflicting du parameters X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fb767eda6e52a5616d077f72c8d5d78c399b401;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 9c09816e5d3..8fed686e903 100644 --- 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 99cc34454ca..430b0a4b023 100644 --- 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 8f34c926ebb..a7cc5d12c62 100644 --- 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 40018dc7eac..fdab188db1f 100644 --- 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