Current du parameters used in wic scripts are conflicting: -b implies --block-size=1 while -k implies --block-size=1K. When both parameters are used, coreutils du and uutils du do not react similarly, leading to failures on Ubuntu 25.10.
As we do want to use the 1K block size, remove -b and add --apparent-size that was implied by it, so we have a predictable behaviour. 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 +- scripts/lib/wic/plugins/source/rawcopy.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 531ac6eb3d4a..9c09816e5d35 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -275,7 +275,7 @@ class Partition(): self.source_file = rootfs # get the rootfs size in the right units for kickstart (kB) - du_cmd = "du -Lbks %s" % rootfs + du_cmd = "du --apparent-size -Lks %s" % rootfs out = exec_cmd(du_cmd) self.size = 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 ba520cd78b06..99cc34454cad 100644 --- a/scripts/lib/wic/plugins/source/bootimg_efi.py +++ b/scripts/lib/wic/plugins/source/bootimg_efi.py @@ -427,7 +427,7 @@ class BootimgEFIPlugin(SourcePlugin): chmod_cmd = "chmod 644 %s" % bootimg exec_cmd(chmod_cmd) - du_cmd = "du -Lbks %s" % bootimg + du_cmd = "du --apparent-size -Lks %s" % bootimg out = exec_cmd(du_cmd) bootimg_size = out.split()[0] diff --git a/scripts/lib/wic/plugins/source/bootimg_pcbios.py b/scripts/lib/wic/plugins/source/bootimg_pcbios.py index caabda6318d0..8f34c926ebbb 100644 --- a/scripts/lib/wic/plugins/source/bootimg_pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg_pcbios.py @@ -305,7 +305,7 @@ class BootimgPcbiosPlugin(SourcePlugin): chmod_cmd = "chmod 644 %s" % bootimg exec_cmd(chmod_cmd) - du_cmd = "du -Lbks %s" % bootimg + du_cmd = "du --apparent-size -Lks %s" % bootimg out = exec_cmd(du_cmd) bootimg_size = out.split()[0] diff --git a/scripts/lib/wic/plugins/source/isoimage_isohybrid.py b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py index 5d42eb5d3e86..40018dc7eacf 100644 --- a/scripts/lib/wic/plugins/source/isoimage_isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py @@ -429,7 +429,7 @@ class IsoImagePlugin(SourcePlugin): shutil.rmtree(isodir) - du_cmd = "du -Lbks %s" % iso_img + du_cmd = "du --apparent-size -Lks %s" % iso_img out = exec_cmd(du_cmd) isoimg_size = int(out.split()[0]) diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index 21903c2f23df..698413b2215a 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -102,7 +102,7 @@ class RawCopyPlugin(SourcePlugin): sparse_copy(src, dst) # get the size in the right units for kickstart (kB) - du_cmd = "du -Lbks %s" % dst + du_cmd = "du --apparent-size -Lks %s" % dst out = exec_cmd(du_cmd) filesize = int(out.split()[0]) --- base-commit: 94d95bea4edec883f3ae2fd89c32b4438ebf015a change-id: 20251122-mathieu-master-next-whinlatter-success-79b680586fba Best regards, -- Mathieu Dubois-Briand <[email protected]>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#226723): https://lists.openembedded.org/g/openembedded-core/message/226723 Mute This Topic: https://lists.openembedded.org/mt/116433996/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
