[oe-commits] [bitbake] 01/01: codeparser: Track oe.utils.conditional usage

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 5156b4bb6876dac636be9726df22c8ee792714dd
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Thu Jul 26 11:10:31 2018 +0000

    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
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cache.py      | 2 +-
 lib/bb/codeparser.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index 168a77a..258d679 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -37,7 +37,7 @@ import bb.utils
 
 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)
diff --git a/lib/bb/codeparser.py b/lib/bb/codeparser.py
index 530f44e..ddd1b97 100644
--- a/lib/bb/codeparser.py
+++ b/lib/bb/codeparser.py
@@ -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)
@@ -214,7 +214,7 @@ class BufferedLogger(Logger):
         self.buffer = []
 
 class PythonParser():
-    getvars = (".getVar", ".appendVar", ".prependVar")
+    getvars = (".getVar", ".appendVar", ".prependVar", "oe.utils.conditional")
     getvarflags = (".getVarFlag", ".appendVarFlag", ".prependVarFlag")
     containsfuncs = ("bb.utils.contains", "base_contains")
     containsanyfuncs = ("bb.utils.contains_any",  "bb.utils.filter")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.