From 92e6591980898b20dfc9702c32e3c632409bff19 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 2 Oct 2023 18:13:53 +0200 Subject: [PATCH] webos: webruntime, enact-*, webos_enhanced_submissions: drop do_fetch[vardeps] and more SRCPV references :Release Notes: Similarly like oe-core did in: https://git.openembedded.org/openembedded-core/commit/?h=nanbield&id=843f82a246a535c353e08072f252d1dc78217872 :Detailed Notes: SRCPV is deferred now from PV to PKGV since: https://git.openembedded.org/openembedded-core/commit/?h=nanbield&id=a8e7b0f932b9ea69b3a218fca18041676c65aba0 :Testing Performed: Only build tested. :QA Notes: No change to image. :Issues Addressed: [WRQ-691] Create GPVB with Yocto 4.3 Nanbield Change-Id: I2ee50a72c474b9f413c08f8cdec49a9143f6c699 --- meta-webos/classes/webos_enhanced_submissions.bbclass | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/meta-webos/classes/webos_enhanced_submissions.bbclass b/meta-webos/classes/webos_enhanced_submissions.bbclass index d5d69fa8c..08616ebad 100644 --- a/meta-webos/classes/webos_enhanced_submissions.bbclass +++ b/meta-webos/classes/webos_enhanced_submissions.bbclass @@ -76,13 +76,11 @@ def webos_enhsub_get_tag(d, webos_v): # Set WEBOS_SRCREV to value from WEBOS_VERSION. WEBOS_SRCREV = "${@webos_enhsub_get_srcrev(d, '${WEBOS_VERSION}')}" -# we don't include SRCPV in PV, so we have to manually include SRCREVs in do_fetch vardeps -do_fetch[vardeps] += "SRCREV_main SRCREV" SRCREV = "${WEBOS_SRCREV}" SRCREV_main = "${WEBOS_SRCREV}" # append WEBOS_PV_SUFFIX to PV when you're using 0 as WEBOS_SUBMISSION to make it clear which SHA-1 was built -WEBOS_PV_SUFFIX = "+gitr${SRCPV}" +WEBOS_PV_SUFFIX = "" # srcrev is mandatory and enough, don't put tag= in SRC_URI # to reenable you need to set WEBOS_GIT_TAG to ";tag=${WEBOS_GIT_PARAM_TAG}" @@ -91,9 +89,6 @@ WEBOS_GIT_TAG = "" WEBOS_GIT_PARAM_BRANCH = "${@webos_version_get_branch('${WEBOS_VERSION}')}" -# When SRCREV isn't SHA-1 show error -do_fetch[prefuncs] += "webos_enhsub_srcrev_sanity_check" - # '0' in 'webos_submission' is used with AUTOREV or SHA-1 without matching tag # show non-fatal ERROR to make sure that it's not accidentally merged in master python webos_enhsub_srcrev_sanity_check() {