]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
classes: image_types: apply EXTRA_IMAGECMD:squashfs* in oe_mksquashfs()
authorMartin Hundebøll <martin@geanix.com>
Mon, 6 May 2024 12:24:13 +0000 (14:24 +0200)
committerSteve Sakoman <steve@sakoman.com>
Sat, 18 May 2024 12:34:45 +0000 (05:34 -0700)
commit39fc503036312e38ff0b9d8fb90b4c929b5ca7df
tree9a92ac22209000c86b28aa295451d85db5bd63b7
parent137bb70ddf9dce30374cbb366196da0d8cc94205
classes: image_types: apply EXTRA_IMAGECMD:squashfs* in oe_mksquashfs()

Since commit c991f9d6031 ("image_types: Set SOURCE_DATE_EPOCH for squashfs"),
I assume, the EXTRA_IMAGECMD:squashfs* variable(s) has been ignored.
This is due to the override magic, which isn't applied to functions
called by IMAGE_CMD:<type>, but only to the IMAGE_CMD:<type> itself.

Other image types (e.g. ext*) works around this by passing the
EXTRA_IMAGECMD variable as an argument to the called function.

To do the same for oe_mksquashfs(), the number of mandatory arguments is
fixed to one (with a little logic to handle the zstd filename). This
allows passing ${EXTRA_IMAGECMD} as an argument to oe_mksquashfs(),
which makes the variable functional again.

Signed-off-by: Martin Hundebøll <martin@geanix.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes-recipe/image_types.bbclass