Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtbase: use platform-specific qt5.sh scripts instead of backend-specific ones 

We have specific scripts per platform to export the qt5 environment variables,
because using the default backend-specific scripts ported from the meta-imx
layer results in mismatches in specific cases (for example, 6UL framebuffer
images only support linuxfb, but the qt5-fb.sh script exports eglfs instead).

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2020-09-28 10:28:53 +02:00
parent 66471fd0c2
commit 3b0cf4eb76
4 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh
View File

@ -1,2 +0,0 @@
#!/bin/sh
export QT_QPA_PLATFORM=eglfs

2
meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh
View File

@ -1,2 +0,0 @@
#!/bin/sh
export QT_QPA_PLATFORM=wayland

2
meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh
View File

@ -1,2 +0,0 @@
#!/bin/sh
export QT_QPA_PLATFORM=xcb

10
meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend
View File

@ -6,13 +6,9 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
IMX_BACKEND = \ # Digi: we use a custom script per platform, not per backend like NXP does
"${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',\
bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \
'fb', d), d)}"
SRC_URI_append = " \ SRC_URI_append = " \
file://qt5-${IMX_BACKEND}.sh \ file://qt5.sh \
" "
SRC_URI_append_imxgpu3d = " \ SRC_URI_append_imxgpu3d = " \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \
@ -52,7 +48,7 @@ do_install_append () {
sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc
fi fi
install -d ${D}${sysconfdir}/profile.d/ install -d ${D}${sysconfdir}/profile.d/
install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/qt5.sh install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/qt5.sh
} }
FILES_${PN} += "${sysconfdir}/profile.d/qt5.sh" FILES_${PN} += "${sysconfdir}/profile.d/qt5.sh"