summaryrefslogtreecommitdiffstats
path: root/meta
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
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')
-rw-r--r--meta/classes/kernel-artifact-names.bbclass13
-rw-r--r--meta/conf/bitbake.conf5
2 files changed, 7 insertions, 11 deletions
diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index d696888322..70b1cb804d 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -1,19 +1,14 @@
1KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" 1KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
2# Don't include the DATETIME variable in the sstate package signatures
3KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
4KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" 2KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}"
5 3
6KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" 4KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
7KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME"
8KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" 5KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}"
9 6
10MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" 7MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
11MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
12 8
13MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" 9MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz"
14MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" 10MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz"
15MODULE_TARBALL_DEPLOY ?= "1" 11MODULE_TARBALL_DEPLOY ?= "1"
16 12
17INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" 13INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
18INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME"
19INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" 14INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}"
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