diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-14 12:24:57 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-19 16:36:36 +0000 |
commit | 03b4c7b669b84b03d44f7fc622e00a447223fb9c (patch) | |
tree | 285da7806f378863ce0488044a2b88c5c7468e0d /recipes-qt/qt5/qt5.inc | |
parent | 5164f84bd6f136e6438eb5847bab08e65d2320b7 (diff) |
qt: remove unnecessary FILES.*-dbg variables for packaging .debug files
* package.bbclass can do it automatically since:
commit da5ec06814e105451cca11cce76b5c5231110524
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5.inc')
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 39 |
1 files changed, 1 insertions, 38 deletions
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 \ |