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/conf | |
| 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/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 65b4432c63..5d994f067d 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
| @@ -452,11 +452,6 @@ STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifac | |||
| 452 | ################################################################## | 452 | ################################################################## |
| 453 | 453 | ||
| 454 | IMAGE_ROOTFS = "${WORKDIR}/rootfs" | 454 | IMAGE_ROOTFS = "${WORKDIR}/rootfs" |
| 455 | IMAGE_BASENAME = "${PN}" | ||
| 456 | IMAGE_VERSION_SUFFIX = "-${DATETIME}" | ||
| 457 | IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME" | ||
| 458 | IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | ||
| 459 | IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" | ||
| 460 | 455 | ||
| 461 | # This option allows for a percentage overage of the actual image size rather than a | 456 | # This option allows for a percentage overage of the actual image size rather than a |
| 462 | # fixed extra space, this is space needed for initial startup and basic operations. | 457 | # fixed extra space, this is space needed for initial startup and basic operations. |