diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-16 14:54:45 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 09:47:45 +0100 |
commit | 43f1cf2d3d4b35b0bcd4bc9a4f464341af5f97dd (patch) | |
tree | 63799027a42a76eee032dd9f4c88f2df03757749 /meta/classes/image_types.bbclass | |
parent | 565d243a1d2dad582ba19573d7a9cc3b15fd62af (diff) | |
download | poky-43f1cf2d3d4b35b0bcd4bc9a4f464341af5f97dd.tar.gz |
image-artifact-names: introduce new bbclass and move some variables into it
* similar to kernel-artifact-names for other recipes/bbclasses which
need to use some deployed artifacts
* bitbake.conf: move IMAGE_BASENAME, IMAGE_VERSION_SUFFIX, IMAGE_NAME,
IMAGE_LINK_NAME variables
* image_types.bbclass: move IMAGE_NAME_SUFFIX variable
* currently IMAGE_NAME_SUFFIX is used only by image.bbclass,
image_types.bbclass and meta/recipes-core/images/build-appliance-image_15.0.0.bb
but if it's needed by some recipe which isn't itself an image, then
it's useful in bitbake.conf, e.g. we have a recipe for creating
VirtualBox appliances which combines .wic.vmdk with .ovf file to
create .zip with appliance, but for that we need the filename of
.wic.vmdk which now contains IMAGE_NAME_SUFFIX
https://github.com/webOS-ports/meta-webos-ports/blob/4980ce52a43ac6897657602810313af359f0b839/meta-luneos/recipes-core/images/luneos-emulator-appliance.inc#L24
* we were hardcoding .rootfs suffix where needed, but for quite long
time it's configurable with IMAGE_NAME_SUFFIX since:
commit 380ee36811939d947024bf78de907e3c071b834f
Author: Patrick Ohly <patrick.ohly@intel.com>
Date: Mon Mar 7 18:07:52 2016 +0100
image creation: allow overriding .rootfs suffix
and might not match with hardcoded .rootfs, so make it easier to
use IMAGE_NAME_SUFFIX where needed even without inheritting whole
image_types.bbclass
[YOCTO #12937]
(From OE-Core rev: 456b700d51a5052a285a8477304f902c335223be)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index ab05cc90ff..66884af8e0 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -1,9 +1,3 @@ | |||
1 | # IMAGE_NAME is the base name for everything produced when building images. | ||
2 | # The actual image that contains the rootfs has an additional suffix (.rootfs | ||
3 | # by default) followed by additional suffices which describe the format (.ext4, | ||
4 | # .ext4.xz, etc.). | ||
5 | IMAGE_NAME_SUFFIX ??= ".rootfs" | ||
6 | |||
7 | # The default aligment of the size of the rootfs is set to 1KiB. In case | 1 | # The default aligment of the size of the rootfs is set to 1KiB. In case |
8 | # you're using the SD card emulation of a QEMU system simulator you may | 2 | # you're using the SD card emulation of a QEMU system simulator you may |
9 | # set this value to 2048 (2MiB alignment). | 3 | # set this value to 2048 (2MiB alignment). |
@@ -231,7 +225,8 @@ IMAGE_CMD_f2fs () { | |||
231 | 225 | ||
232 | EXTRA_IMAGECMD = "" | 226 | EXTRA_IMAGECMD = "" |
233 | 227 | ||
234 | inherit siteinfo kernel-arch | 228 | inherit siteinfo kernel-arch image-artifact-names |
229 | |||
235 | JFFS2_ENDIANNESS ?= "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" | 230 | JFFS2_ENDIANNESS ?= "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" |
236 | JFFS2_ERASEBLOCK ?= "0x40000" | 231 | JFFS2_ERASEBLOCK ?= "0x40000" |
237 | EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" | 232 | EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" |