summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-02-24 21:21:57 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-12-09 13:20:21 +0100
commitf79b64f4aa819fb13499f691e433a69efb3c28fb (patch)
treee684ea69be2ca84c38b450073dde549975e4decf
parentdebcabe047ec194ad84b8f7fc7d85b23f25d8642 (diff)
downloadopenembedded-core-contrib-f79b64f4aa819fb13499f691e433a69efb3c28fb.tar.gz
openembedded-core-contrib-f79b64f4aa819fb13499f691e433a69efb3c28fb.tar.bz2
openembedded-core-contrib-f79b64f4aa819fb13499f691e433a69efb3c28fb.zip
kernel-artifact-names.bbclass: use PR instead of PKGR in KERNEL_ARTIFACT_NAME
* otherwise PKGR seen in do_install, do_deploy and do_deploy_links will have different value in each of them (PRSERV will return different value of EXTENDPRAUTO because TASKHASH is different for each of these tasks and also cause unnecessary multiple EXTENDPRAUTO increments for each build). [YOCTO #12937] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/classes/kernel-artifact-names.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index 529e0c565e..41ef6e884d 100644
--- a/meta/classes/kernel-artifact-names.bbclass
+++ b/meta/classes/kernel-artifact-names.bbclass
@@ -6,7 +6,12 @@
inherit image-artifact-names
-KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PKGR}-${MACHINE}"
+# Intentionally use PR instead of PKGR, because EXTENDPRAUTO included
+# in PKGR will have different value for do_install/do_deploy/do_deploy_links
+# tasks with different TASKHASH, causing multiple EXTENDPRAUTO increments for
+# each kernel build and more importantly preventing do_deploy_links to
+# reference artifacts created do_deploy task
+KERNEL_ARTIFACT_NAME ?= "${PKGE}-${PKGV}-${PR}-${MACHINE}"
KERNEL_ARTIFACT_LINK_NAME ?= "${KERNEL_ARTIFACT_NAME}${IMAGE_VERSION_SUFFIX}"
KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}"