[meta-freescale] [meta-fsl-arm PATCH 02/14] qtbase: Stop using base_contains
Otavio Salvador
otavio at ossystems.com.br
Wed May 4 16:11:54 PDT 2016
The base_contains function is deprecated and we ought to use
bb.utils.contains instead.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index b18bf17..d336c0f 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -1,6 +1,6 @@
# Copyright (C) 2013 Eric Bénard - Eukréa Electromatique
-HAS_X11 = "${@base_contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
+HAS_X11 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 1, 0, d)}"
IS_MX6SL = "0"
IS_MX6SL_mx6sl = "1"
@@ -8,11 +8,11 @@ IS_MX6SL_mx6sl = "1"
PACKAGECONFIG_GL_mx6q = "gles2"
PACKAGECONFIG_GL_mx6dl = "gles2"
PACKAGECONFIG_GL_mx6sx = "gles2"
-PACKAGECONFIG_GL_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}"
-QT_CONFIG_FLAGS_append_mx6q = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
-QT_CONFIG_FLAGS_append_mx6dl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
-QT_CONFIG_FLAGS_append_mx6sx = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
-QT_CONFIG_FLAGS_append_mx6sl = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \
+PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}"
+QT_CONFIG_FLAGS_append_mx6q = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6dl = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6sx = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}"
+QT_CONFIG_FLAGS_append_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', \
' -no-opengl -linuxfb -no-eglfs', d)}"
do_configure_prepend_mx6() {
--
2.8.2
More information about the meta-freescale
mailing list