summaryrefslogtreecommitdiffstats
path: root/meta/classes/metadata_scm.bbclass
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-18 14:20:19 +0000
commitcc2e2c2d065530a5ab33fed139d16fe1dcdca4d9 (patch)
treee4ea055cd00d718cfda3ac95d0d0b62bb0a9b2d1 /meta/classes/metadata_scm.bbclass
parent4ec9e388e722bff127604bc8cd024df836ba1411 (diff)
downloadpoky-cc2e2c2d065530a5ab33fed139d16fe1dcdca4d9.tar.gz
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. (From OE-Core rev: edbe823ddf53aecc58d28fbcf7de1a1dc2dc79c8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 005651dc782859c01f170fb974811b2a13cb2cef) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/metadata_scm.bbclass')
-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 @@
1METADATA_BRANCH ?= "${@base_detect_branch(d)}" 1METADATA_BRANCH ?= "${@base_detect_branch(d)}"
2METADATA_BRANCH[vardepvalue] = "${METADATA_BRANCH}"
2METADATA_REVISION ?= "${@base_detect_revision(d)}" 3METADATA_REVISION ?= "${@base_detect_revision(d)}"
4METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}"
3 5
4def base_detect_revision(d): 6def base_detect_revision(d):
5 path = base_get_scmbasepath(d) 7 path = base_get_scmbasepath(d)