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 <[email protected]> --- scripts/lib/wic/partition.py | 2 +- scripts/lib/wic/plugins/source/bootimg_efi.py | 2 +- scripts/lib/wic/plugins/source/bootimg_pcbios.py | 2 +- scripts/lib/wic/plugins/source/isoimage_isohybrid.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 9c09816e5d35..8fed686e903e 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 99cc34454cad..430b0a4b023a 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 8f34c926ebbb..a7cc5d12c620 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 40018dc7eacf..fdab188db1f8 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 --- base-commit: 6145837147dc2a6d54a221f9cd7fe90d6895ff90 change-id: 20251209-mathieu-more-du-params-92eb2ac31a49 Best regards, -- Mathieu Dubois-Briand <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#227443): https://lists.openembedded.org/g/openembedded-core/message/227443 Mute This Topic: https://lists.openembedded.org/mt/116695460/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
