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) | |
| download | meta-qt5-03b4c7b669b84b03d44f7fc622e00a447223fb9c.tar.gz | |
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() { | |||
| 49 | # suppress QA check complaining | 49 | # suppress QA check complaining | 
| 50 | INSANE_SKIP_${PN}-dbg += "libdir" | 50 | INSANE_SKIP_${PN}-dbg += "libdir" | 
| 51 | INSANE_SKIP_${PN}-examples += "libdir" | 51 | INSANE_SKIP_${PN}-examples += "libdir" | 
| 52 | INSANE_SKIP_${PN}-examples-dbg += "libdir" | ||
| 53 | INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf" | 52 | INSANE_SKIP_${PN}-examples-dev += "libdir dev-elf" | 
| 54 | 53 | ||
| 55 | 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 " | 54 | PACKAGES =. "${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples " | 
| 56 | 55 | ||
| 57 | ALLOW_EMPTY_${PN} = "1" | 56 | ALLOW_EMPTY_${PN} = "1" | 
| 58 | ALLOW_EMPTY_${PN}-dbg = "1" | ||
| 59 | ALLOW_EMPTY_${PN}-plugins = "1" | 57 | ALLOW_EMPTY_${PN}-plugins = "1" | 
| 60 | ALLOW_EMPTY_${PN}-qmlplugins = "1" | 58 | ALLOW_EMPTY_${PN}-qmlplugins = "1" | 
| 61 | 59 | ||
| @@ -71,27 +69,6 @@ RRECOMMENDS_${PN}-dev = " \ | |||
| 71 | ${PN}-qmldesigner \ | 69 | ${PN}-qmldesigner \ | 
| 72 | " | 70 | " | 
| 73 | 71 | ||
| 74 | RRECOMMENDS_${PN}-dbg = " \ | ||
| 75 | ${PN}-plugins-dbg \ | ||
| 76 | ${PN}-qmlplugins-dbg \ | ||
| 77 | " | ||
| 78 | |||
| 79 | # extra -dbg packages | ||
| 80 | FILES_${PN}-qmlplugins-dbg = " \ | ||
| 81 | ${OE_QMAKE_PATH_QML}/*/.debug \ | ||
| 82 | ${OE_QMAKE_PATH_QML}/*/*/.debug \ | ||
| 83 | ${OE_QMAKE_PATH_QML}/*/*/*/.debug \ | ||
| 84 | ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ | ||
| 85 | " | ||
| 86 | FILES_${PN}-tools-dbg = " \ | ||
| 87 | ${OE_QMAKE_PATH_BINS}/.debug \ | ||
| 88 | " | ||
| 89 | FILES_${PN}-plugins-dbg = " \ | ||
| 90 | ${OE_QMAKE_PATH_PLUGINS}/*/.debug/* \ | ||
| 91 | ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \ | ||
| 92 | ${OE_QMAKE_PATH_PLUGINS}/*/*/*/.debug/* \ | ||
| 93 | " | ||
| 94 | |||
| 95 | # extra packages | 72 | # extra packages | 
| 96 | FILES_${PN}-qmldesigner += " \ | 73 | FILES_${PN}-qmldesigner += " \ | 
| 97 | ${OE_QMAKE_PATH_QML}/*/designer \ | 74 | ${OE_QMAKE_PATH_QML}/*/designer \ | 
| @@ -163,10 +140,6 @@ FILES_${PN}-dev += " \ | |||
| 163 | ${OE_QMAKE_PATH_LIBS}/*.la \ | 140 | ${OE_QMAKE_PATH_LIBS}/*.la \ | 
| 164 | ${OE_QMAKE_PATH_HEADERS}/* \ | 141 | ${OE_QMAKE_PATH_HEADERS}/* \ | 
| 165 | " | 142 | " | 
| 166 | FILES_${PN}-dbg += " \ | ||
| 167 | ${OE_QMAKE_PATH_LIBS}/.debug \ | ||
| 168 | ${OE_QMAKE_PATH_LIBEXECS}/.debug \ | ||
| 169 | " | ||
| 170 | FILES_${PN}-staticdev += " \ | 143 | FILES_${PN}-staticdev += " \ | 
| 171 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 144 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 
| 172 | ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ | 145 | ${OE_QMAKE_PATH_PLUGINS}/*/*.a \ | 
| @@ -195,16 +168,6 @@ FILES_${PN}-examples-dev = " \ | |||
| 195 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ | 168 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*${SOLIBSDEV} \ | 
| 196 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ | 169 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*${SOLIBSDEV} \ | 
| 197 | " | 170 | " | 
| 198 | FILES_${PN}-examples-dbg = " \ | ||
| 199 | ${OE_QMAKE_PATH_EXAMPLES}/.debug \ | ||
| 200 | ${OE_QMAKE_PATH_EXAMPLES}/*/.debug \ | ||
| 201 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/.debug \ | ||
| 202 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/.debug \ | ||
| 203 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/.debug \ | ||
| 204 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/.debug \ | ||
| 205 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/.debug \ | ||
| 206 | ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/.debug \ | ||
| 207 | " | ||
| 208 | FILES_${PN}-examples-staticdev = " \ | 171 | FILES_${PN}-examples-staticdev = " \ | 
| 209 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ | 172 | ${OE_QMAKE_PATH_EXAMPLES}/*.a \ | 
| 210 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ | 173 | ${OE_QMAKE_PATH_EXAMPLES}/*/*.a \ | 
