* drop ${PKGE}-${PKGV}-${PR} from kernel artifacts names (this is the latest build) and add it only in hardlinks created in do_deploy_links so that we can use PKGR there again (because these links are generally used only by human operators and they don't have their own TASKHASH or the IMAGE_VERSION_SUFFIX might be set to some release name which they do understand
* this allows to drop package_get_auto_pr from kernel do_deploy as well, leaving only 2 EXTENDPRAUTO bumps for each kernel build (do_package and do_deploy_links, unfortunatelly these will still have different value, so if you're looking for the exact kernel image in deploy directory based on kernel image package version seen on the device the EXTENDPRAUTO part of PR will be different). [YOCTO #12937] Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- meta/classes/image-artifact-names.bbclass | 2 +- meta/classes/kernel-artifact-names.bbclass | 7 +------ meta/classes/kernel.bbclass | 1 - 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/meta/classes/image-artifact-names.bbclass b/meta/classes/image-artifact-names.bbclass index d5ba035f5a..b23cef22ca 100644 --- a/meta/classes/image-artifact-names.bbclass +++ b/meta/classes/image-artifact-names.bbclass @@ -3,7 +3,7 @@ ################################################################## IMAGE_BASENAME = "${PN}" -IMAGE_VERSION_SUFFIX = "-${DATETIME}" +IMAGE_VERSION_SUFFIX = "${PKGE}-${PKGV}-${PKGR}-${DATETIME}" IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME" IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}" IMAGE_LINK_NAME = "${IMAGE_NAME}${IMAGE_VERSION_SUFFIX}" diff --git a/meta/classes/kernel-artifact-names.bbclass b/meta/classes/kernel-artifact-names.bbclass index 41ef6e884d..92e08297cc 100644 --- a/meta/classes/kernel-artifact-names.bbclass +++ b/meta/classes/kernel-artifact-names.bbclass @@ -6,12 +6,7 @@ inherit image-artifact-names -# 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_NAME ?= "${MACHINE}" KERNEL_ARTIFACT_LINK_NAME ?= "${KERNEL_ARTIFACT_NAME}${IMAGE_VERSION_SUFFIX}" KERNEL_IMAGE_NAME ?= "${KERNEL_ARTIFACT_NAME}" diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index e41adcbebe..3b8bfd2991 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -700,7 +700,6 @@ kernel_do_deploy() { } do_deploy[cleandirs] = "${DEPLOYDIR}" do_deploy[dirs] = "${DEPLOYDIR} ${B}" -do_deploy[prefuncs] += "package_get_auto_pr" addtask deploy after do_populate_sysroot do_packagedata -- 2.17.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core