aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-01-10 12:29:33 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-01-11 08:48:01 +0000
commit402191df19faa576e8b0635d7864868739af274b (patch)
treec93edda511345dc04940efa7f6793c9f94c60b77
parentc3eff2040f541e67ad2f9447459d435f7e88353b (diff)
Move function to more appropriate place
Move the common function to a common bbclass. Change-Id: Ifb4e48a284b9bf6026ab644049e61016e3eef04b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt/classes/b2qt-utils.bbclass4
-rw-r--r--meta-boot2qt/classes/internal-build.bbclass4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-boot2qt/classes/b2qt-utils.bbclass b/meta-boot2qt/classes/b2qt-utils.bbclass
index 7c27348d..dc5aca6e 100644
--- a/meta-boot2qt/classes/b2qt-utils.bbclass
+++ b/meta-boot2qt/classes/b2qt-utils.bbclass
@@ -34,3 +34,7 @@ def contains_regex(variable, regex, truevalue, falsevalue, d):
if re.match(regex, m):
return truevalue
return falsevalue
+
+# bring back base_conditional as Draak is using too old meta layer
+def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
+ return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d)
diff --git a/meta-boot2qt/classes/internal-build.bbclass b/meta-boot2qt/classes/internal-build.bbclass
index b1c581dd..d842dcb0 100644
--- a/meta-boot2qt/classes/internal-build.bbclass
+++ b/meta-boot2qt/classes/internal-build.bbclass
@@ -53,7 +53,3 @@ python enable_internal_build () {
addhandler enable_internal_build
enable_internal_build[eventmask] = "bb.event.ConfigParsed"
-
-# bring back base_conditional as Draak is using too old meta layer
-def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
- return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d)