diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh deleted file mode 100644 index 6ffe8f271..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Use EGLFS platform plugin for images without X11 -[ -f "/etc/init.d/xserver-nodm" ] || export QT_QPA_PLATFORM="eglfs" diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh deleted file mode 100644 index 16c8e26d7..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -export QT_QPA_PLATFORM="wayland" - -[ -f "/etc/profile.d/weston.sh" ] && return - -export QT_QPA_PLATFORM="xcb" - -# Use EGLFS platform plugin for images without XWayland and X11 -[ -f "/etc/xserver-nodm/Xserver" ] || export QT_QPA_PLATFORM="eglfs" diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8mn/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8mn/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index c1ed65746..f7ae3240b 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -6,9 +6,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SCRIPT_DIR = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', 'fb', d)}" + # Digi: we use a custom script per platform, not per backend like NXP does SRC_URI_append = " \ - file://qt5.sh \ + file://${SCRIPT_DIR}/qt5.sh \ " SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \