diff options
Diffstat (limited to 'meta/classes-recipe/image-artifact-names.bbclass')
-rw-r--r-- | meta/classes-recipe/image-artifact-names.bbclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/classes-recipe/image-artifact-names.bbclass b/meta/classes-recipe/image-artifact-names.bbclass index 9dc25b6dde..ac2376d59a 100644 --- a/meta/classes-recipe/image-artifact-names.bbclass +++ b/meta/classes-recipe/image-artifact-names.bbclass | |||
@@ -11,11 +11,20 @@ | |||
11 | IMAGE_BASENAME ?= "${PN}" | 11 | IMAGE_BASENAME ?= "${PN}" |
12 | IMAGE_VERSION_SUFFIX ?= "-${DATETIME}" | 12 | IMAGE_VERSION_SUFFIX ?= "-${DATETIME}" |
13 | IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME SOURCE_DATE_EPOCH" | 13 | IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME SOURCE_DATE_EPOCH" |
14 | IMAGE_NAME ?= "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}" | 14 | IMAGE_NAME ?= "${IMAGE_LINK_NAME}${IMAGE_VERSION_SUFFIX}" |
15 | IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}-${MACHINE}" | 15 | IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}${IMAGE_MACHINE_SUFFIX}" |
16 | 16 | ||
17 | # This needs to stay in sync with IMAGE_LINK_NAME, but with INITRAMFS_IMAGE instead of IMAGE_BASENAME | 17 | # This needs to stay in sync with IMAGE_LINK_NAME, but with INITRAMFS_IMAGE instead of IMAGE_BASENAME |
18 | INITRAMFS_IMAGE_NAME ?= "${@['${INITRAMFS_IMAGE}-${MACHINE}', ''][d.getVar('INITRAMFS_IMAGE') == '']}" | 18 | INITRAMFS_IMAGE_NAME ?= "${@['${INITRAMFS_IMAGE}${IMAGE_MACHINE_SUFFIX}', ''][d.getVar('INITRAMFS_IMAGE') == '']}" |
19 | |||
20 | # The default DEPLOY_DIR_IMAGE is ${MACHINE} directory: | ||
21 | # meta/conf/bitbake.conf:DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR}/images/${MACHINE}" | ||
22 | # so many people find it unnecessary to include this suffix to every image | ||
23 | # stored there, but other people often fetch various images for different | ||
24 | # MACHINEs to the same downloads directory and then the suffix is very helpful | ||
25 | # add separate variable for projects to decide which scheme works best for them | ||
26 | # without understanding the IMAGE_NAME/IMAGE_LINK_NAME structure. | ||
27 | IMAGE_MACHINE_SUFFIX ??= "-${MACHINE}" | ||
19 | 28 | ||
20 | # IMAGE_NAME is the base name for everything produced when building images. | 29 | # IMAGE_NAME is the base name for everything produced when building images. |
21 | # The actual image that contains the rootfs has an additional suffix (.rootfs | 30 | # The actual image that contains the rootfs has an additional suffix (.rootfs |