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-connectivity/libqofono/libqofono_git.bb | 4 --- recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 1 - recipes-qt/examples/cinematicexperience_1.0.bb | 1 - recipes-qt/examples/qt5everywheredemo_1.0.bb | 1 - recipes-qt/examples/qt5ledscreen_1.0.bb | 1 - recipes-qt/examples/qt5nmapcarousedemo_1.0.bb | 1 - recipes-qt/examples/qt5nmapper_1.0.bb | 1 - recipes-qt/examples/qtsmarthome_1.0.bb | 1 - recipes-qt/examples/quitbattery_1.0.0.bb | 1 - recipes-qt/examples/quitindicators_1.0.1.bb | 1 - recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 - recipes-qt/maliit/maliit-plugins-qt5_git.bb | 2 -- recipes-qt/qsiv/qsiv_1.1.bb | 2 -- recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 +--- recipes-qt/qt5/qt5-creator_4.5.1.bb | 6 ---- recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb | 1 - recipes-qt/qt5/qt5.inc | 39 +--------------------- recipes-qt/qwt/qwt-qt5_6.1.3.bb | 1 - 18 files changed, 2 insertions(+), 70 deletions(-) diff --git a/recipes-connectivity/libqofono/libqofono_git.bb b/recipes-connectivity/libqofono/libqofono_git.bb index 18e9b8fd..303a0057 100644 --- a/recipes-connectivity/libqofono/libqofono_git.bb +++ b/recipes-connectivity/libqofono/libqofono_git.bb @@ -21,10 +21,6 @@ do_install_append() { PACKAGES += "${PN}-tests" -FILES_${PN}-dbg += " \ - /lib/libqofono-qt5/tests/.debug \ - ${libdir}/qt5/qml/MeeGo/QOfono/.debug \ -" FILES_${PN}-tests = " \ ${libdir}/libqofono-qt5/tests/tst_* \ /opt/tests/libqofono-qt5 \ 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/" diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb b/recipes-qt/examples/cinematicexperience_1.0.bb index 7f921d85..9a90f1d4 100644 --- a/recipes-qt/examples/cinematicexperience_1.0.bb +++ b/recipes-qt/examples/cinematicexperience_1.0.bb @@ -37,5 +37,4 @@ do_install() { chmod +x ${D}${bindir}/Qt5_CinematicExperience } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb b/recipes-qt/examples/qt5everywheredemo_1.0.bb index 493344f7..56034cc4 100644 --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb @@ -20,7 +20,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/examples/qt5ledscreen_1.0.bb b/recipes-qt/examples/qt5ledscreen_1.0.bb index e2b994bc..e221941f 100644 --- a/recipes-qt/examples/qt5ledscreen_1.0.bb +++ b/recipes-qt/examples/qt5ledscreen_1.0.bb @@ -18,7 +18,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb index 145f7974..54875f97 100644 --- a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb +++ b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb @@ -21,7 +21,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/examples/qt5nmapper_1.0.bb b/recipes-qt/examples/qt5nmapper_1.0.bb index 762ad20b..3c2bc1a9 100644 --- a/recipes-qt/examples/qt5nmapper_1.0.bb +++ b/recipes-qt/examples/qt5nmapper_1.0.bb @@ -22,7 +22,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/examples/qtsmarthome_1.0.bb b/recipes-qt/examples/qtsmarthome_1.0.bb index da1bbdf3..03f3c994 100644 --- a/recipes-qt/examples/qtsmarthome_1.0.bb +++ b/recipes-qt/examples/qtsmarthome_1.0.bb @@ -22,7 +22,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/components ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/examples/quitbattery_1.0.0.bb b/recipes-qt/examples/quitbattery_1.0.0.bb index 6c2d3d11..7593ab29 100644 --- a/recipes-qt/examples/quitbattery_1.0.0.bb +++ b/recipes-qt/examples/quitbattery_1.0.0.bb @@ -20,7 +20,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/examples/quitindicators_1.0.1.bb b/recipes-qt/examples/quitindicators_1.0.1.bb index 3e42d047..bc370f44 100644 --- a/recipes-qt/examples/quitindicators_1.0.1.bb +++ b/recipes-qt/examples/quitindicators_1.0.1.bb @@ -19,7 +19,6 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} } -FILES_${PN}-dbg += "${datadir}/${P}/.debug" FILES_${PN} += "${datadir}" RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index e0a0e0e1..fabb43ee 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -33,7 +33,6 @@ FILES_${PN} += "\ FILES_${PN}-dbg += "\ ${libdir}/maliit-framework-tests \ - ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts/.debug \ " FILES_${PN}-dev += "\ diff --git a/recipes-qt/maliit/maliit-plugins-qt5_git.bb b/recipes-qt/maliit/maliit-plugins-qt5_git.bb index 7dc1a730..54bc7432 100644 --- a/recipes-qt/maliit/maliit-plugins-qt5_git.bb +++ b/recipes-qt/maliit/maliit-plugins-qt5_git.bb @@ -28,8 +28,6 @@ FILES_${PN} += "\ ${datadir} \ " -FILES_${PN}-dbg += "${libdir}/maliit/plugins/.debug" - S= "${WORKDIR}/git" EXTRA_OEMAKE += "INSTALL_ROOT=${D}" diff --git a/recipes-qt/qsiv/qsiv_1.1.bb b/recipes-qt/qsiv/qsiv_1.1.bb index bb2efa69..5773c3e7 100644 --- a/recipes-qt/qsiv/qsiv_1.1.bb +++ b/recipes-qt/qsiv/qsiv_1.1.bb @@ -24,5 +24,3 @@ do_install_append() { FILES_${PN} += "${libdir}/${P}" RDEPENDS_${PN} += "qtdeclarative-qmlplugins" - -FILES_${PN}-dbg += "${libdir}/${P}/.debug" diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index db26afbb..5bea3c89 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -55,7 +55,7 @@ SRC_URI += " \ file://OEQt5Toolchain.cmake \ " -PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" +PACKAGES = "${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" @@ -71,11 +71,6 @@ FILES_${PN}-tools-staticdev = " \ ${OE_QMAKE_PATH_LIBS}/*.a \ " -FILES_${PN}-tools-dbg = " \ - ${libdir}/.debug \ - ${OE_QMAKE_PATH_BINS}/.debug \ -" - FILES_${PN}-tools = " \ ${libdir}/lib*${SOLIBS} \ ${OE_QMAKE_PATH_BINS}/* \ diff --git a/recipes-qt/qt5/qt5-creator_4.5.1.bb b/recipes-qt/qt5/qt5-creator_4.5.1.bb index 4c26ac49..08d8289d 100644 --- a/recipes-qt/qt5/qt5-creator_4.5.1.bb +++ b/recipes-qt/qt5/qt5-creator_4.5.1.bb @@ -59,12 +59,6 @@ FILES_${PN} += " \ ${datadir}/icons \ ${libdir}${QT_DIR_NAME}/qtcreator \ " -FILES_${PN}-dbg += " \ - ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ - ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ - ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \ - ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ -" FILES_${PN}-dev += " \ ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ diff --git a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb index 383145be..d359db99 100644 --- a/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb +++ b/recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb @@ -23,5 +23,4 @@ S = "${WORKDIR}/git/vboxtouch" inherit qmake5 FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/generic/.debug/" FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*" diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 99105bd9..4b9476c6 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -49,13 +49,11 @@ python __anonymous() { # suppress QA check complaining INSANE_SKIP_${PN}-dbg += "libdir" INSANE_SKIP_${PN}-examples += "libdir" -INSANE_SKIP_${PN}-examples-dbg += "libdir" INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf" -PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " +PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples " ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-dbg = "1" ALLOW_EMPTY_${PN}-plugins = "1" ALLOW_EMPTY_${PN}-qmlplugins = "1" @@ -71,27 +69,6 @@ RRECOMMENDS_${PN}-dev = " \ ${PN}-qmldesigner \ " -RRECOMMENDS_${PN}-dbg = " \ - ${PN}-plugins-dbg \ - ${PN}-qmlplugins-dbg \ - " - -# extra -dbg packages -FILES_${PN}-qmlplugins-dbg = " \ - ${OE_QMAKE_PATH_QML}/*/.debug \ - ${OE_QMAKE_PATH_QML}/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/*/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ -" -FILES_${PN}-tools-dbg = " \ - ${OE_QMAKE_PATH_BINS}/.debug \ -" -FILES_${PN}-plugins-dbg = " \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug/* \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/*/.debug/* \ -" - # extra packages FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/designer \ @@ -163,10 +140,6 @@ FILES_${PN}-dev += " \ ${OE_QMAKE_PATH_LIBS}/*.la \ ${OE_QMAKE_PATH_HEADERS}/* \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_LIBS}/.debug \ - ${OE_QMAKE_PATH_LIBEXECS}/.debug \ -" FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_LIBS}/*.a \ ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ @@ -195,16 +168,6 @@ FILES_${PN}-examples-dev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ " -FILES_${PN}-examples-dbg = " \ - ${OE_QMAKE_PATH_EXAMPLES}/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/.debug \ - ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/.debug \ -" FILES_${PN}-examples-staticdev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*.a \ ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ diff --git a/recipes-qt/qwt/qwt-qt5_6.1.3.bb b/recipes-qt/qwt/qwt-qt5_6.1.3.bb index 1c6e10b7..49f4f9e5 100644 --- a/recipes-qt/qwt/qwt-qt5_6.1.3.bb +++ b/recipes-qt/qwt/qwt-qt5_6.1.3.bb @@ -40,7 +40,6 @@ PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " FILES_${PN}-examples = "${bindir}/*" FILES_${PN}-features = "${prefix}/features" FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" -FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" FILES_${PN}-doc += "${prefix}/doc" INSANE_SKIP_${PN}-plugins += "libdir" -- cgit v1.2.3-54-g00ecf