Skip to contentSkip to conversation

image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior

PATCH New Marek Vasut 1 participant 1 message Jul 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior

Currently the mkfs.btrfs generates large images with a lot of wasted space. This happens since OE-core updated btrfs-tools from 4.13.3 to 4.15.1 in commit 94b645aa77 ("btrfs-tools: update to 4.15.1") .

Note in mkfs.btrfs(8) manpage section -r says the following:
"
-r|--rootdir <rootdir>
...
Note This option may enlarge the image or file to ensure it’s big enough to contain the files from rootdir. Since version 4.14.1 the filesystem size is not minimized. Please see option --shrink if you need that functionality.

--shrink
Shrink the filesystem to its minimal size, only works with --rootdir option.
...
Note prior to version 4.14.1, the shrinking was done automatically.
"

Add the --shrink option to EXTRA_IMAGECMD_btrfs to reinstate the original behavior and un-waste the space.

Cc Alexander Kanavin <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Ross Burton <[email protected]>
---
 meta/classes/image_types.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes/image_types.bbclass +1 -1
index 954d6739ec..6b28cdbb3c 100644
@@ -230,7 +230,7 @@ EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLO
 EXTRA_IMAGECMD_ext2 ?= "-i 4096"
 EXTRA_IMAGECMD_ext3 ?= "-i 4096"
 EXTRA_IMAGECMD_ext4 ?= "-i 4096"
-EXTRA_IMAGECMD_btrfs ?= "-n 4096"
+EXTRA_IMAGECMD_btrfs ?= "-n 4096 --shrink"
 EXTRA_IMAGECMD_f2fs ?= ""
 
 do_image_cpio[depends] += "cpio-native:do_populate_sysroot"
Signature · 1 line
2.30.2