Patchwork [bitbake-devel] data_smart: Ensure variable flags are accounted for in config data hash

login
register
mail settings
Submitter Richard Purdie
Date June 20, 2013, 8:53 p.m.
Message ID <1371761594.20823.244.camel@ted>
Download mbox | patch
Permalink /patch/52181/
State New
Headers show

Comments

Richard Purdie - June 20, 2013, 8:53 p.m.
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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Martin Jansa - July 8, 2013, 4:27 p.m.
Can we get this backported into bitbake-1.18 please?


On Thu, Jun 20, 2013 at 10:53 PM, Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> 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]
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
> index 2fd8ccd..fa7811e 100644
> --- a/bitbake/lib/bb/data_smart.py
> +++ b/bitbake/lib/bb/data_smart.py
> @@ -738,6 +738,12 @@ class DataSmart(MutableMapping):
>              value = d.getVar(key, False) or ""
>              data.update({key:value})
>
> +            varflags = d.getVarFlags(key)
> +            if not varflags:
> +                continue
> +            for f in varflags:
> +                data.update({'%s[%s]' % (key, f):varflags[f]})
> +
>          for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]:
>              bb_list = d.getVar(key, False) or []
>              bb_list.sort()
>
>
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>

Patch

diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 2fd8ccd..fa7811e 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -738,6 +738,12 @@  class DataSmart(MutableMapping):
             value = d.getVar(key, False) or ""
             data.update({key:value})
 
+            varflags = d.getVarFlags(key)
+            if not varflags:
+                continue
+            for f in varflags:
+                data.update({'%s[%s]' % (key, f):varflags[f]})
+
         for key in ["__BBTASKS", "__BBANONFUNCS", "__BBHANDLERS"]:
             bb_list = d.getVar(key, False) or []
             bb_list.sort()