diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2018-07-26 11:10:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:45:15 +0100 |
commit | 9c419271b5cf927924682c3200451979f02409bb (patch) | |
tree | dce256d55c945e4b2db93194948fbe7fc217965e /bitbake/lib/bb/codeparser.py | |
parent | 6ed781e0719d8f72238e7451cc206e3f9a76af52 (diff) | |
download | poky-9c419271b5cf927924682c3200451979f02409bb.tar.gz |
bitbake: codeparser: Track oe.utils.conditional usage
* base_conditional was already removed from oe-core:
http://git.openembedded.org/openembedded-core/commit/?id=0391fcad9103abca0796a068f957d0df63ab4776
after the usage was migrated to oe.utils.conditional:
http://git.openembedded.org/openembedded-core/commit/?id=c97acbd034532895ce57c6717ed1b3ccc7900b0d
so we can handle just ".conditional" version
* add 1st parameter to variable dependencies, that way when you use
FOO = "${@oe.utils.conditional('VAR', 'VALUE', 'true', 'false')"
FOO variable will have dependency on VAR variable and you don't need
to add FOO[vardeps] += "VAR" manually every time you use
oe.utils.conditional
* this is similar to contains tracking from:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=3890
http://git.openembedded.org/bitbake/commit/?id=ed2d0a22a80299de0cfd377999950cf4b26c512e
http://git.openembedded.org/bitbake/commit/?id=0b9d117631ce909312d53b93289e61defc6be01c
but conditional is simpler, we don't need to handle the first
parameter as a set
(Bitbake rev: 5156b4bb6876dac636be9726df22c8ee792714dd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/codeparser.py')
-rw-r--r-- | bitbake/lib/bb/codeparser.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/codeparser.py b/bitbake/lib/bb/codeparser.py index 530f44e578..ddd1b97dcb 100644 --- a/bitbake/lib/bb/codeparser.py +++ b/bitbake/lib/bb/codeparser.py | |||
@@ -140,7 +140,7 @@ class CodeParserCache(MultiProcessCache): | |||
140 | # so that an existing cache gets invalidated. Additionally you'll need | 140 | # so that an existing cache gets invalidated. Additionally you'll need |
141 | # to increment __cache_version__ in cache.py in order to ensure that old | 141 | # to increment __cache_version__ in cache.py in order to ensure that old |
142 | # recipe caches don't trigger "Taskhash mismatch" errors. | 142 | # recipe caches don't trigger "Taskhash mismatch" errors. |
143 | CACHE_VERSION = 9 | 143 | CACHE_VERSION = 10 |
144 | 144 | ||
145 | def __init__(self): | 145 | def __init__(self): |
146 | MultiProcessCache.__init__(self) | 146 | MultiProcessCache.__init__(self) |
@@ -214,7 +214,7 @@ class BufferedLogger(Logger): | |||
214 | self.buffer = [] | 214 | self.buffer = [] |
215 | 215 | ||
216 | class PythonParser(): | 216 | class PythonParser(): |
217 | getvars = (".getVar", ".appendVar", ".prependVar") | 217 | getvars = (".getVar", ".appendVar", ".prependVar", "oe.utils.conditional") |
218 | getvarflags = (".getVarFlag", ".appendVarFlag", ".prependVarFlag") | 218 | getvarflags = (".getVarFlag", ".appendVarFlag", ".prependVarFlag") |
219 | containsfuncs = ("bb.utils.contains", "base_contains") | 219 | containsfuncs = ("bb.utils.contains", "base_contains") |
220 | containsanyfuncs = ("bb.utils.contains_any", "bb.utils.filter") | 220 | containsanyfuncs = ("bb.utils.contains_any", "bb.utils.filter") |