[OE-core] [PATCH 1/2] oe.utils, utils.bbclass: Add any_contains and base_any_contains

[Otavio Salvador]

This is similar to the contains but matches any of values. This is
useful to match for example several DISTRO_FEATURES which ought to
include a PACKAGECONFIG option.

For example:

PACKAGECONFIG ??= "${@base_any_contains('DISTRO_FEATURES', 'x11 wayland', 'gtk+', '', d)}"

Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
 meta/classes/utils.bbclass |  3 +++
 meta/lib/oe/utils.py       | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 0a533af..966eda1 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -26,6 +26,9 @@ def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
 def base_contains(variable, checkvalues, truevalue, falsevalue, d):
     return oe.utils.contains(variable, checkvalues, truevalue, falsevalue, d)
 
+def base_any_contains(variable, checkvalues, truevalue, falsevalue, d):
+    return oe.utils.any_contains(variable, checkvalues, truevalue, falsevalue, d)
+
 def base_both_contain(variable1, variable2, checkvalue, d):
     return oe.utils.both_contain(variable1, variable2, checkvalue, d)
 
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index defa536..029d713 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -54,6 +54,19 @@ def contains(variable, checkvalues, truevalue, falsevalue, d):
         return truevalue
     return falsevalue
 
+def any_contains(variable, checkvalues, truevalue, falsevalue, d):
+    val = d.getVar(variable, True)
+    if not val:
+        return falsevalue
+    val = set(val.split())
+    if isinstance(checkvalues, basestring):
+        checkvalues = set(checkvalues.split())
+    else:
+        checkvalues = set(checkvalues)
+    if checkvalues in val:
+        return truevalue
+    return falsevalue
+
 def both_contain(variable1, variable2, checkvalue, d):
     if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1:
         return checkvalue
-- 
1.9.1