merge of '90a1ac7c53dbaf35a4b93a66275d608d001eb092'

     and 'ec80efa0b796cacd58e78cc5eeb3e250413712e8'

1 files changed, 14 insertions, 0 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index e413afb2b3..670b97a72d 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -40,6 +40,20 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
 	else:
 		return falsevalue
 
+def base_contains(variable, checkvalue, truevalue, falsevalue, d):
+       import bb
+       if bb.data.getVar(variable,d,1).find(checkvalue) != -1:
+               return truevalue
+       else:
+               return falsevalue
+
+def base_both_contain(variable1, variable2, checkvalue, d):
+       import bb
+       if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1:
+               return checkvalue
+       else:
+               return ""
+
 DEPENDS_prepend="${@base_dep_prepend(d)} "
 
 def base_set_filespath(path, d):