diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-07 15:07:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-24 14:31:42 +0100 |
commit | 98f9b05875c9a989490ad98b38f8f8bcaf0ca9d8 (patch) | |
tree | 30805d610c5a410e4d95c9667604b85855f2f6f6 /bitbake/lib/bb | |
parent | 8b1636763d6df9d68a50ed017ff0ed5f358b7321 (diff) | |
download | poky-98f9b05875c9a989490ad98b38f8f8bcaf0ca9d8.tar.gz |
bitbake: data_smart: Handle hashing of datastores within datastores correctly
If there is a datastore within a datastore (e.g. BB_ORIGENV) then
get-hash() doesn;t correclty handle the contents using the memory
address instead of the contents.
This is a patch from dominik.jaeger@nokia.com which addresses
this problem. Its been low priority since we don't include
BB_ORIGENV anywhere this would cause an issue as standard.
[YOCTO #12473]
(Bitbake rev: 1a8bcfc1eb89ccff834ba68fb514330b510976a2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 70257ab7f8..7f1b6dcb4f 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -1000,7 +1000,10 @@ class DataSmart(MutableMapping): | |||
1000 | continue | 1000 | continue |
1001 | 1001 | ||
1002 | value = d.getVar(key, False) or "" | 1002 | value = d.getVar(key, False) or "" |
1003 | data.update({key:value}) | 1003 | if type(value) is type(self): |
1004 | data.update({key:value.get_hash()}) | ||
1005 | else: | ||
1006 | data.update({key:value}) | ||
1004 | 1007 | ||
1005 | varflags = d.getVarFlags(key, internalflags = True) | 1008 | varflags = d.getVarFlags(key, internalflags = True) |
1006 | if not varflags: | 1009 | if not varflags: |