diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-16 23:38:17 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-19 17:18:07 +0000 |
commit | 65e67f40280aee4aa5ec454dbdeeac54fae0adf9 (patch) | |
tree | 54e753cb136d74a41d51b7090ae1f577c27d3e53 | |
parent | f1a2ee5a18f565c2e63743af3191b6834941bde9 (diff) | |
download | poky-65e67f40280aee4aa5ec454dbdeeac54fae0adf9.tar.gz |
bitbake: data_smart: Ensure hash reflects vardepvalue flags correctly
The get_hash() function is used to decide if the base configuration has changed
and hence whether a reparse is required. The vardepvalue flag's value was not
expanded but it is often used in contexts like:
METADATA_REVISION = "${@base_detect_revision(d)}"
METADATA_REVISION[vardepvalue] = "${METADATA_REVISION}"
which in it's unexpanded form means reparsing doesn't happen when it should
as the data appears unchanged. Update get_hash to expand the values of
vardepvalue so reparsing works as expected. This avoids basehash mismatch
errors such as the one recently caused by using METADATA_REVISION in poky.conf's
DISTRO_VERSION variable. The issue there could be exposed by a recipe using
DISTRO_VERSION with the sequence:
bitbake os-release
<change the revision of the metadata with a dummy commit>
bitbake os-release -C install
which was caused because METADATA_REVISION changed but the metadata didn't reparse.
(Bitbake rev: 26ccf1575aef2d6e2d7717d3bd10b1ed0d5a777d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index c559102cf5..2328c334ac 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -1005,7 +1005,7 @@ class DataSmart(MutableMapping): | |||
1005 | else: | 1005 | else: |
1006 | data.update({key:value}) | 1006 | data.update({key:value}) |
1007 | 1007 | ||
1008 | varflags = d.getVarFlags(key, internalflags = True) | 1008 | varflags = d.getVarFlags(key, internalflags = True, expand=["vardepvalue"]) |
1009 | if not varflags: | 1009 | if not varflags: |
1010 | continue | 1010 | continue |
1011 | for f in varflags: | 1011 | for f in varflags: |