Signed-off-by: John Madieu <j.mad...@expemb.com> cleanned qtbase.bbappend
Signed-off-by: John Madieu <j.mad...@expemb.com> --- conf/layer.conf | 4 ++++ qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 29 +++++++++++++++++++++++++ recipes-qt/qt5/qtbase_%.bbappend | 34 ------------------------------ 3 files changed, 33 insertions(+), 34 deletions(-) create mode 100644 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend delete mode 100644 recipes-qt/qt5/qtbase_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index bea5a65..6346459 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -12,3 +12,7 @@ BBFILE_PRIORITY_raspberrypi = "9" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" +# Let us add layer-specific (such as qt5-layer) bbappends +# which are only applied when that layer is included in our configuration +BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \ + for layer in BBFILE_COLLECTIONS.split())}" diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend new file mode 100644 index 0000000..8b77bfa --- /dev/null +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -0,0 +1,29 @@ + +do_configure_prepend_rpi() { + + sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf + if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux +QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} +QMAKE_LIBS_EGL = -lEGL -lGLESv2 +EOF + + if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +EGLFS_DEVICE_INTEGRATION = eglfs_brcm +EOF + else + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF +EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host +EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp +EOF + fi + fi + cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF + + +load(qt_config) + +EOF +} diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend deleted file mode 100644 index ac158a9..0000000 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ /dev/null @@ -1,34 +0,0 @@ - -do_configure_prepend_rpi() { - - sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf - if ! grep -q '^EGLFS_' ${S}/mkspecs/linux-oe-g++/qmake.conf; then - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -QMAKE_INCDIR_EGL = \$\$[QT_SYSROOT]${includedir}/interface/vcos/pthreads \$\$[QT_SYSROOT]${includedir}/interface/vmcs_host/linux -QMAKE_INCDIR_OPENGL_ES2 = \$\${QMAKE_INCDIR_EGL} -QMAKE_LIBS_EGL = -lEGL -lGLESv2 -EOF - - if [ -d ${S}/src/plugins/platforms/eglfs/deviceintegration/eglfs_brcm ]; then - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -EGLFS_DEVICE_INTEGRATION = eglfs_brcm -EOF - else - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF -EGLFS_PLATFORM_HOOKS_LIBS = -lbcm_host -EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/../devices/linux-rasp-pi-g++/qeglfshooks_pi.cpp -EOF - fi - fi - cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF - - -load(qt_config) - -EOF -} - - - - - -- 1.9.1 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto