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 | |
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>
-rw-r--r-- | recipes-connectivity/libqofono/libqofono_git.bb | 4 | ||||
-rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.10.1.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/cinematicexperience_1.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/qt5everywheredemo_1.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/qt5ledscreen_1.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/qt5nmapcarousedemo_1.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/qt5nmapper_1.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/qtsmarthome_1.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/quitbattery_1.0.0.bb | 1 | ||||
-rw-r--r-- | recipes-qt/examples/quitindicators_1.0.1.bb | 1 | ||||
-rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 | ||||
-rw-r--r-- | recipes-qt/maliit/maliit-plugins-qt5_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qsiv/qsiv_1.1.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-creator_4.5.1.bb | 6 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-plugin-generic-vboxtouch_git.bb | 1 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 39 | ||||
-rw-r--r-- | 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() { | |||
21 | 21 | ||
22 | PACKAGES += "${PN}-tests" | 22 | PACKAGES += "${PN}-tests" |
23 | 23 | ||
24 | FILES_${PN}-dbg += " \ | ||
25 | /lib/libqofono-qt5/tests/.debug \ | ||
26 | ${libdir}/qt5/qml/MeeGo/QOfono/.debug \ | ||
27 | " | ||
28 | FILES_${PN}-tests = " \ | 24 | FILES_${PN}-tests = " \ |
29 | ${libdir}/libqofono-qt5/tests/tst_* \ | 25 | ${libdir}/libqofono-qt5/tests/tst_* \ |
30 | /opt/tests/libqofono-qt5 \ | 26 | /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() { | |||
64 | RDEPENDS_${PN} = "python-core python-sip qtbase" | 64 | RDEPENDS_${PN} = "python-core python-sip qtbase" |
65 | 65 | ||
66 | FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" | 66 | FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" |
67 | FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/" | ||
68 | 67 | ||
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() { | |||
37 | chmod +x ${D}${bindir}/Qt5_CinematicExperience | 37 | chmod +x ${D}${bindir}/Qt5_CinematicExperience |
38 | } | 38 | } |
39 | 39 | ||
40 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
41 | FILES_${PN} += "${datadir}" | 40 | 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() { | |||
20 | cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} | 20 | cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
24 | FILES_${PN} += "${datadir}" | 23 | FILES_${PN} += "${datadir}" |
25 | 24 | ||
26 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 25 | 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() { | |||
18 | cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${P} | 18 | cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${P} |
19 | } | 19 | } |
20 | 20 | ||
21 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
22 | FILES_${PN} += "${datadir}" | 21 | FILES_${PN} += "${datadir}" |
23 | 22 | ||
24 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 23 | 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() { | |||
21 | cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} | 21 | cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} |
22 | } | 22 | } |
23 | 23 | ||
24 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
25 | FILES_${PN} += "${datadir}" | 24 | FILES_${PN} += "${datadir}" |
26 | 25 | ||
27 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 26 | 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() { | |||
22 | cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} | 22 | cp -R --no-dereference --preserve=mode,links ${S}/content ${D}${datadir}/${P} |
23 | } | 23 | } |
24 | 24 | ||
25 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
26 | FILES_${PN} += "${datadir}" | 25 | FILES_${PN} += "${datadir}" |
27 | 26 | ||
28 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 27 | 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() { | |||
22 | cp -R --no-dereference --preserve=mode,links ${S}/components ${D}${datadir}/${P} | 22 | cp -R --no-dereference --preserve=mode,links ${S}/components ${D}${datadir}/${P} |
23 | } | 23 | } |
24 | 24 | ||
25 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
26 | FILES_${PN} += "${datadir}" | 25 | FILES_${PN} += "${datadir}" |
27 | 26 | ||
28 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 27 | 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() { | |||
20 | cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} | 20 | cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} |
21 | } | 21 | } |
22 | 22 | ||
23 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
24 | FILES_${PN} += "${datadir}" | 23 | FILES_${PN} += "${datadir}" |
25 | 24 | ||
26 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 25 | 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() { | |||
19 | cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} | 19 | cp -R --no-dereference --preserve=mode,links ${S}/qml ${D}${datadir}/${P} |
20 | } | 20 | } |
21 | 21 | ||
22 | FILES_${PN}-dbg += "${datadir}/${P}/.debug" | ||
23 | FILES_${PN} += "${datadir}" | 22 | FILES_${PN} += "${datadir}" |
24 | 23 | ||
25 | RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins" | 24 | 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} += "\ | |||
33 | 33 | ||
34 | FILES_${PN}-dbg += "\ | 34 | FILES_${PN}-dbg += "\ |
35 | ${libdir}/maliit-framework-tests \ | 35 | ${libdir}/maliit-framework-tests \ |
36 | ${OE_QMAKE_PATH_PLUGINS}/platforminputcontexts/.debug \ | ||
37 | " | 36 | " |
38 | 37 | ||
39 | FILES_${PN}-dev += "\ | 38 | 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} += "\ | |||
28 | ${datadir} \ | 28 | ${datadir} \ |
29 | " | 29 | " |
30 | 30 | ||
31 | FILES_${PN}-dbg += "${libdir}/maliit/plugins/.debug" | ||
32 | |||
33 | S= "${WORKDIR}/git" | 31 | S= "${WORKDIR}/git" |
34 | 32 | ||
35 | EXTRA_OEMAKE += "INSTALL_ROOT=${D}" | 33 | 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() { | |||
24 | 24 | ||
25 | FILES_${PN} += "${libdir}/${P}" | 25 | FILES_${PN} += "${libdir}/${P}" |
26 | RDEPENDS_${PN} += "qtdeclarative-qmlplugins" | 26 | RDEPENDS_${PN} += "qtdeclarative-qmlplugins" |
27 | |||
28 | 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 += " \ | |||
55 | file://OEQt5Toolchain.cmake \ | 55 | file://OEQt5Toolchain.cmake \ |
56 | " | 56 | " |
57 | 57 | ||
58 | PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" | 58 | PACKAGES = "${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools" |
59 | 59 | ||
60 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" | 60 | PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" |
61 | 61 | ||
@@ -71,11 +71,6 @@ FILES_${PN}-tools-staticdev = " \ | |||
71 | ${OE_QMAKE_PATH_LIBS}/*.a \ | 71 | ${OE_QMAKE_PATH_LIBS}/*.a \ |
72 | " | 72 | " |
73 | 73 | ||
74 | FILES_${PN}-tools-dbg = " \ | ||
75 | ${libdir}/.debug \ | ||
76 | ${OE_QMAKE_PATH_BINS}/.debug \ | ||
77 | " | ||
78 | |||
79 | FILES_${PN}-tools = " \ | 74 | FILES_${PN}-tools = " \ |
80 | ${libdir}/lib*${SOLIBS} \ | 75 | ${libdir}/lib*${SOLIBS} \ |
81 | ${OE_QMAKE_PATH_BINS}/* \ | 76 | ${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} += " \ | |||
59 | ${datadir}/icons \ | 59 | ${datadir}/icons \ |
60 | ${libdir}${QT_DIR_NAME}/qtcreator \ | 60 | ${libdir}${QT_DIR_NAME}/qtcreator \ |
61 | " | 61 | " |
62 | FILES_${PN}-dbg += " \ | ||
63 | ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ | ||
64 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ | ||
65 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qmldesigner/.debug \ | ||
66 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ | ||
67 | " | ||
68 | 62 | ||
69 | FILES_${PN}-dev += " \ | 63 | FILES_${PN}-dev += " \ |
70 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ | 64 | ${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" | |||
23 | inherit qmake5 | 23 | inherit qmake5 |
24 | 24 | ||
25 | FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" | 25 | FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/generic/libvboxtouchplugin.so" |
26 | FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/generic/.debug/" | ||
27 | FILES_${PN}-dev += "${OE_QMAKE_PATH_LIBS}/cmake/*" | 26 | 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() { | |||
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 \ |
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 " | |||
40 | FILES_${PN}-examples = "${bindir}/*" | 40 | FILES_${PN}-examples = "${bindir}/*" |
41 | FILES_${PN}-features = "${prefix}/features" | 41 | FILES_${PN}-features = "${prefix}/features" |
42 | FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" | 42 | FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" |
43 | FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" | ||
44 | FILES_${PN}-doc += "${prefix}/doc" | 43 | FILES_${PN}-doc += "${prefix}/doc" |
45 | 44 | ||
46 | INSANE_SKIP_${PN}-plugins += "libdir" | 45 | INSANE_SKIP_${PN}-plugins += "libdir" |