diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-10 12:29:33 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-01-11 08:48:01 +0000 |
| commit | 402191df19faa576e8b0635d7864868739af274b (patch) | |
| tree | c93edda511345dc04940efa7f6793c9f94c60b77 | |
| parent | c3eff2040f541e67ad2f9447459d435f7e88353b (diff) | |
| download | meta-boot2qt-402191df19faa576e8b0635d7864868739af274b.tar.gz | |
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.bbclass | 4 | ||||
| -rw-r--r-- | meta-boot2qt/classes/internal-build.bbclass | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-boot2qt/classes/b2qt-utils.bbclass b/meta-boot2qt/classes/b2qt-utils.bbclass index 7c27348..dc5aca6 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): | |||
| 34 | if re.match(regex, m): | 34 | if re.match(regex, m): |
| 35 | return truevalue | 35 | return truevalue |
| 36 | return falsevalue | 36 | return falsevalue |
| 37 | |||
| 38 | # bring back base_conditional as Draak is using too old meta layer | ||
| 39 | def base_conditional(variable, checkvalue, truevalue, falsevalue, d): | ||
| 40 | 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 b1c581d..d842dcb 100644 --- a/meta-boot2qt/classes/internal-build.bbclass +++ b/meta-boot2qt/classes/internal-build.bbclass | |||
| @@ -53,7 +53,3 @@ python enable_internal_build () { | |||
| 53 | 53 | ||
| 54 | addhandler enable_internal_build | 54 | addhandler enable_internal_build |
| 55 | enable_internal_build[eventmask] = "bb.event.ConfigParsed" | 55 | enable_internal_build[eventmask] = "bb.event.ConfigParsed" |
| 56 | |||
| 57 | # bring back base_conditional as Draak is using too old meta layer | ||
| 58 | def base_conditional(variable, checkvalue, truevalue, falsevalue, d): | ||
| 59 | return oe.utils.conditional(variable, checkvalue, truevalue, falsevalue, d) | ||
