From e1d51d42a7edf21226f6bd71ec4be0733f9c660a Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 4 May 2016 20:06:30 -0300 Subject: qtbase: Stop using base_contains The base_contains function is deprecated and we ought to use bb.utils.contains instead. Change-Id: Ib53b854f79f45ecd75da9f5c07a276465f2675fb Signed-off-by: Otavio Salvador --- 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() { -- cgit v1.2.3-54-g00ecf