]> code.ossystems Code Review - openembedded-core.git/commit
image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior
authorMarek Vasut <marex@denx.de>
Tue, 24 Aug 2021 01:51:36 +0000 (03:51 +0200)
committerSteve Sakoman <steve@sakoman.com>
Fri, 27 Aug 2021 14:58:08 +0000 (04:58 -1000)
commit6de30e62fc5815edc19c96b49c0ff9681298c56c
treea051223c46d3d4fc72c56505394a73f497216fe4
parentef8b7946b4793db653ef7dd716e1d3f919a84725
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.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c4a99d36967302c176b62fad840b5e79486ea356)
Cc: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/image_types.bbclass