[oe-commits] [openembedded-core] 22/29: kernel-artifact-names.bbclass: use PR instead of PKGR in KERNEL_ARTIFACT_NAME

git at git.openembedded.org git at git.openembedded.org
Tue Jan 14 21:25:17 UTC 2020


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9b2af7ca33b74b0bbd9f1a1375d44de6dbd18b56
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Tue Jan 14 10:12:22 2020 +0100

    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 at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel-artifact-names.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass
index 529e0c5..41ef6e8 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}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list