summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-09 17:16:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-09 17:18:53 +0000
commit005651dc782859c01f170fb974811b2a13cb2cef (patch)
treed34ccdb168edd4ae44d91118d3c32a083cf650ec
parent20ef6292c3b573f1e867437e821b0a176c2e0e94 (diff)
downloadopenembedded-core-contrib-005651dc782859c01f170fb974811b2a13cb2cef.tar.gz
openembedded-core-contrib-005651dc782859c01f170fb974811b2a13cb2cef.tar.bz2
openembedded-core-contrib-005651dc782859c01f170fb974811b2a13cb2cef.zip
metadata_scm: Fix signature handling of METADATA_REVISION and METADATA_BRANCH
We're not interested in the dependencies of these functions and what those functions look like, we're interested in the value the variable has. Force the hashed value to be the actual value from the function. This means using METADATA_REVISION in DISTRO_VERSION for example now correctly rebuilds when it changes value. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/metadata_scm.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index 58bb4c555a..2608a7ef7b 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -1,5 +1,7 @@
METADATA_BRANCH ?= "${@base_detect_branch(d)}"
+METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}"
METADATA_REVISION ?= "${@base_detect_revision(d)}"
+METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}"
def base_detect_revision(d):
path = base_get_scmbasepath(d)