From 03b4c7b669b84b03d44f7fc622e00a447223fb9c Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 12:24:57 +0000 Subject: qt: remove unnecessary FILES.*-dbg variables for packaging .debug files * package.bbclass can do it automatically since: commit da5ec06814e105451cca11cce76b5c5231110524 Author: Richard Purdie Date: Tue Dec 15 15:38:54 2015 +0000 package: Add auto package splitting of .debug files * .debug files for examples were incorrectly picked by qtbase-qmlplugins-dbg causing following QE error, because unlike qtbase-examples-dbg we don't have libdir in INSANE_SKIP. ERROR: qtbase-5.11.2+gitAUTOINC+49efea26a5-r0 do_package_qa: QA Issue: qtbase-qmlplugins-dbg: found library in wrong location: /usr/share/qt5/examples/widgets/tools/plugandpaint/plugins/.debug/libpnp_extrafilters.so qtbase-qmlplugins-dbg: found library in wrong location: /usr/share/qt5/examples/widgets/tools/styleplugin/styles/.debug/libsimplestyleplugin.so qtbase-qmlplugins-dbg: found library in wrong location: /usr/share/qt5/examples/widgets/tools/echoplugin/plugins/.debug/libechoplugin.so [libdir] ERROR: qtbase-5.11.2+gitAUTOINC+49efea26a5-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. Signed-off-by: Martin Jansa --- recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 1 - 1 file changed, 1 deletion(-) (limited to 'recipes-python/pyqt5/python-pyqt5_5.10.1.bb') diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb index 9a0f8499..a9b52d9a 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb @@ -64,5 +64,4 @@ do_install() { RDEPENDS_${PN} = "python-core python-sip qtbase" FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" -FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/" -- cgit v1.2.3-54-g00ecf From b716195f609de6547cfdfadfd4fd25292a6bbf09 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 14 Sep 2018 12:35:37 +0000 Subject: qmake5_paths: change the default QT_DIR_NAME to be empty * there aren't many people using qt4 and qt5 in the same image anymore, it's time to stop using this work around and to follow default packaging rules Signed-off-by: Martin Jansa --- classes/qmake5_paths.bbclass | 2 +- recipes-connectivity/libqofono/libqofono_git.bb | 6 +++--- recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'recipes-python/pyqt5/python-pyqt5_5.10.1.bb') diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index f3c7b112..ca7e4fc2 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -2,7 +2,7 @@ # about conflicts with qt4, then you can add qmake5_paths.bbclass # to your distro layer and flatten all QT_DIR_NAME directories -QT_DIR_NAME ?= "/qt5" +QT_DIR_NAME ?= "" # This is useful for target recipes to reference native mkspecs QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}" diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb index 303a0057..6b4ec6cf 100644 --- a/recipes-connectivity/libqofono/libqofono_git.bb +++ b/recipes-connectivity/libqofono/libqofono_git.bb @@ -26,10 +26,10 @@ FILES_${PN}-tests = " \ /opt/tests/libqofono-qt5 \ " FILES_${PN} += " \ - ${libdir}/qt5/qml/MeeGo/QOfono/qmldir \ - ${libdir}/qt5/qml/MeeGo/QOfono/libQOfonoQtDeclarative.so \ + ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/qmldir \ + ${OE_QMAKE_PATH_QML}/MeeGo/QOfono/libQOfonoQtDeclarative.so \ " FILES_${PN}-dev += " \ - ${datadir}/qt5/mkspecs \ + ${OE_QMAKE_PATH_ARCHDATA}/mkspecs \ ${libdir}/libqofono-qt5.prl \ " diff --git a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb index a9b52d9a..505db59d 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.10.1.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.10.1.bb @@ -48,7 +48,7 @@ do_configure_prepend() { QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` echo "[Qt $QT_VERSION]" >> pyqt.cfg echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg - echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} + echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} } do_compile() { -- cgit v1.2.3-54-g00ecf