summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2019-01-18 21:45:54 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-21 23:44:34 +0000
commit7178c69ea26b0887624b470db677050ac6603d7e (patch)
tree5036579b1a63b0651e145ad85186e061e5f407dc /bitbake/lib
parent1873c9605dcfb0af6eb57936c8adf3a9e23dcfb0 (diff)
downloadpoky-7178c69ea26b0887624b470db677050ac6603d7e.tar.gz
bitbake: bb.data_smart: only try to expand refs to valid variable names
This aligns the behavior of expansion with the recipe parser, only attempting to expand references to valid variable names. This avoids adding references for things like `${foo#${TOPDIR}}` to our vardeps without imposing much additional processing overhead beyond the change to the expansion regexp. YOCTO #12987 (Bitbake rev: df2ac65370aa86cdbc1574fdede25e3519410e45) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/data_smart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 1f45cd975d..07db7be97a 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -40,7 +40,7 @@ logger = logging.getLogger("BitBake.Data")
40 40
41__setvar_keyword__ = ["_append", "_prepend", "_remove"] 41__setvar_keyword__ = ["_append", "_prepend", "_remove"]
42__setvar_regexp__ = re.compile(r'(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$') 42__setvar_regexp__ = re.compile(r'(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$')
43__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") 43__expand_var_regexp__ = re.compile(r"\${[a-zA-Z0-9\-_+./~]+?}")
44__expand_python_regexp__ = re.compile(r"\${@.+?}") 44__expand_python_regexp__ = re.compile(r"\${@.+?}")
45__whitespace_split__ = re.compile(r'(\s)') 45__whitespace_split__ = re.compile(r'(\s)')
46__override_regexp__ = re.compile(r'[a-z0-9]+') 46__override_regexp__ = re.compile(r'[a-z0-9]+')