From: Haris Okanovic Date: Thu, 7 Nov 2019 18:51:42 +0000 (-0600) Subject: isoimage-isohybrid.py: Parameterize ESP partition size X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~12823 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db4be094b0d6741ca4f9e2cbb499fc9c224fa690;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git isoimage-isohybrid.py: Parameterize ESP partition size Add "esp_extra_blocks" plugin parameter so that caller may change ESP's free space from the default 100 blocks. Signed-off-by: Haris Okanovic Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 95a54a09d21..11326a274b6 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -336,11 +336,13 @@ class IsoImagePlugin(SourcePlugin): (img_iso_dir, isodir) exec_cmd(install_cmd) else: + # 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 out = exec_cmd(du_cmd) blocks = int(out.split()[0]) - # Add some extra space for file system overhead - blocks += 100 + blocks += esp_extra_blocks logger.debug("Added 100 extra blocks to %s to get to %d " "total blocks", part.mountpoint, blocks)