Skip to content

Commit

Permalink
codeparser: Track oe.utils.conditional usage
Browse files Browse the repository at this point in the history
* 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  • Loading branch information
shr-project committed Jul 25, 2018
1 parent 24c5f29 commit 1e34db0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/bb/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

logger = logging.getLogger("BitBake.Cache")

__cache_version__ = "151"
__cache_version__ = "152"

def getCacheFile(path, filename, data_hash):
return os.path.join(path, filename + "." + data_hash)
Expand Down
4 changes: 2 additions & 2 deletions lib/bb/codeparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class CodeParserCache(MultiProcessCache):
# so that an existing cache gets invalidated. Additionally you'll need
# to increment __cache_version__ in cache.py in order to ensure that old
# recipe caches don't trigger "Taskhash mismatch" errors.
CACHE_VERSION = 9
CACHE_VERSION = 10

def __init__(self):
MultiProcessCache.__init__(self)
Expand Down Expand Up @@ -214,7 +214,7 @@ def flush(self):
self.buffer = []

class PythonParser():
getvars = (".getVar", ".appendVar", ".prependVar")
getvars = (".getVar", ".appendVar", ".prependVar", ".conditional")
getvarflags = (".getVarFlag", ".appendVarFlag", ".prependVarFlag")
containsfuncs = ("bb.utils.contains", "base_contains")
containsanyfuncs = ("bb.utils.contains_any", "bb.utils.filter")
Expand Down

0 comments on commit 1e34db0

Please sign in to comment.