diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 09:19:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-29 13:28:24 +0100 |
commit | eb1f9284ea7eb34717de9963cc31636166766026 (patch) | |
tree | f09790a2e26dff893b5ec8c5b45593de683541c6 /bitbake/lib/bb/data_smart.py | |
parent | 46dcd80b36177c31c0d9fa6e678b9b13aeabe6f0 (diff) | |
download | poky-eb1f9284ea7eb34717de9963cc31636166766026.tar.gz |
bitbake: bitbake: data_smart: Ensure variable flags are accounted for in config data hash
Currently if the flags set against a variable in the base data store
change, it doesn't automatically trigger a reparse when it really
should. For example with the blacklist class setting:
PNBLACKLIST[qemu] = "bar"
PNBLACKLIST[bash] = "foo"
will not trigger a reparse if only one entry is changed and a
blacklisted recipe can still be built.
I did consider using BB_SIGNATURE_EXCLUDE_FLAGS in here however it
doesn't make sense, we want to trigger a reparse when any of the
flags change too (which is different to the sstate signatures which
we wouldn't want to change in those cases).
[YOCTO #4627]
(Bitbake master rev: ed74ea50043f6feb698c891e571feda2b9f8513d)
(Bitbake rev: 9313ff77f39abf776556cd7b0edb3c08854d68ef)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 2fd8ccdebd..fa7811e6f4 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -738,6 +738,12 @@ class DataSmart(MutableMapping): | |||
738 | value = d.getVar(key, False) or "" | 738 | value = d.getVar(key, False) or "" |
739 | data.update({key:value}) | 739 | data.update({key:value}) |
740 | 740 | ||
741 | varflags = d.getVarFlags(key) | ||
742 | if not varflags: | ||
743 | continue | ||
744 | for f in varflags: | ||
745 | data.update({'%s[%s]' % (key, f):varflags[f]}) | ||
746 | |||
741 | for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]: | 747 | for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]: |
742 | bb_list = d.getVar(key, False) or [] | 748 | bb_list = d.getVar(key, False) or [] |
743 | bb_list.sort() | 749 | bb_list.sort() |