diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-08-19 22:15:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-21 14:49:42 +0100 |
commit | a65c1216d7c4c9283817361252034d7c7f59cf31 (patch) | |
tree | ee587dd4e7efd15e9d1a4eef29653ab696054e4c /meta/classes | |
parent | 8f16469e97c86078cf6129e9120dc58447e4cc13 (diff) | |
download | poky-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/classes')
-rw-r--r-- | meta/classes/kernel-artifact-names.bbclass | 13 |
1 files changed, 4 insertions, 9 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 @@ | |||
1 | KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" | 1 | KERNEL_IMAGE_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
2 | # Don't include the DATETIME variable in the sstate package signatures | ||
3 | KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
4 | KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" | 2 | KERNEL_IMAGE_SYMLINK_NAME ?= "${MACHINE}" |
5 | 3 | ||
6 | KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" | 4 | KERNEL_DTB_BASE_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
7 | KERNEL_DTB_BASE_NAME[vardepsexclude] = "DATETIME" | ||
8 | KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" | 5 | KERNEL_DTB_SYMLINK_NAME ?= "${MACHINE}" |
9 | 6 | ||
10 | MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" | 7 | MODULE_IMAGE_BASE_NAME ?= "modules-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
11 | MODULE_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" | ||
12 | 8 | ||
13 | MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" | 9 | MODULE_TARBALL_BASE_NAME ?= "${MODULE_IMAGE_BASE_NAME}.tgz" |
14 | MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" | 10 | MODULE_TARBALL_SYMLINK_NAME ?= "modules-${MACHINE}.tgz" |
15 | MODULE_TARBALL_DEPLOY ?= "1" | 11 | MODULE_TARBALL_DEPLOY ?= "1" |
16 | 12 | ||
17 | INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}-${DATETIME}" | 13 | INITRAMFS_BASE_NAME ?= "initramfs-${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFIX}" |
18 | INITRAMFS_BASE_NAME[vardepsexclude] = "DATETIME" | ||
19 | INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" | 14 | INITRAMFS_SYMLINK_NAME ?= "initramfs-${MACHINE}" |