From a99b95c899e6c20b9f46fa04766c155e3a32949a Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 10 Jan 2017 17:39:26 -0600 Subject: qtbase: Recipe cleanup - List variables in override priority order - Replace deprecated base_contains - Remove extraneous whitespace Signed-off-by: Tom Hochstein Signed-off-by: Otavio Salvador --- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dynamic-layers') diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index a69dbec8..b7dc15c7 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -13,11 +13,11 @@ SRC_URI_append_imxgpu3d = " \ " PACKAGECONFIG_GL_imxpxp = "gles2" -PACKAGECONFIG_GL_imxgpu3d = "gles2" PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)}" +PACKAGECONFIG_GL_imxgpu3d = "gles2" QT_CONFIG_FLAGS_APPEND = "" -QT_CONFIG_FLAGS_APPEND_imxpxp = "${@base_contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" -QT_CONFIG_FLAGS_APPEND_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -no-opengl -linuxfb -no-eglfs', d)}" -QT_CONFIG_FLAGS_APPEND_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' -no-eglfs', ' -eglfs', d)}" +QT_CONFIG_FLAGS_APPEND_imxpxp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}" +QT_CONFIG_FLAGS_APPEND_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-no-opengl -linuxfb -no-eglfs', d)}" +QT_CONFIG_FLAGS_APPEND_imxgpu3d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '-no-eglfs', '-eglfs', d)}" QT_CONFIG_FLAGS_append = " ${QT_CONFIG_FLAGS_APPEND}" -- cgit v1.2.3-54-g00ecf