summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-08-19 22:15:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-21 14:49:42 +0100
commita65c1216d7c4c9283817361252034d7c7f59cf31 (patch)
treeee587dd4e7efd15e9d1a4eef29653ab696054e4c /meta/conf
parent8f16469e97c86078cf6129e9120dc58447e4cc13 (diff)
downloadpoky-a65c1216d7c4c9283817361252034d7c7f59cf31.tar.gz
bitbake.conf, kernel-artifact-names.bbclass: introduce IMAGE_VERSION_SUFFIX instead of using DATETIME directly
* this makes it easier to use different version string than DATETIME, e.g. set from jenkins job while keeping the suffix consistent across all artifacts stored in DEPLOYDIR (From OE-Core rev: 1245935b9bf32e0321d8ff12492983ba8506190a) 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.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f68954c511..1941633a54 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -445,8 +445,9 @@ STAGING_KERNEL_BUILDDIR = "${TMPDIR}/work-shared/${MACHINE}/kernel-build-artifac
445 445
446IMAGE_ROOTFS = "${WORKDIR}/rootfs" 446IMAGE_ROOTFS = "${WORKDIR}/rootfs"
447IMAGE_BASENAME = "${PN}" 447IMAGE_BASENAME = "${PN}"
448IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}" 448IMAGE_VERSION_SUFFIX = "-${DATETIME}"
449IMAGE_NAME[vardepsexclude] += "DATETIME" 449IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME"
450IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
450IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}" 451IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
451 452
452# This option allows for a percentage overage of the actual image size rather than a 453# This option allows for a percentage overage of the actual image size rather than a