diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 02:16:27 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-28 13:39:57 +0200 |
commit | d2d5b7804e5e2c5895439faf22fb378329261830 (patch) | |
tree | 12f456c2e3fa1bbb0deedb44fa826af4bab1477e /recipes-qt/qt5 | |
parent | 38de259db85f43008db4bd2133791ee81f29a01c (diff) |
qt5: package files with and without QT_DIR_NAME prefix
* makes it easier to modify paths without QA warnings about unpackaged files
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 39 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase.inc | 2 |
2 files changed, 32 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 286f9188..711ad45e 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -82,13 +82,30 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} } -PACKAGES =. "${PN}-tools ${PN}-plugins ${PN}-plugins-dbg ${PN}-mkspecs " -FILES_${PN}-tools = "${bindir}/*" -FILES_${PN}-plugins = "${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV}" -FILES_${PN}-plugins-dbg = "${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*" - +PACKAGES =. "${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-tools ${PN}-plugins ${PN}-mkspecs " +FILES_${PN}-tools-dbg = " \ + ${bindir}/${QT_DIR_NAME}/.debug \ + ${bindir}/.debug \ +" +FILES_${PN}-plugins-dbg = " \ + ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/* \ + ${libdir}/plugins/*/.debug/* \ +" +FILES_${PN}-tools = " \ + ${bindir}/${QT_DIR_NAME}/* \ + ${bindir}/* \ +" +FILES_${PN}-plugins = " \ + ${libdir}/${QT_DIR_NAME}/plugins/*/*${SOLIBSDEV} \ + ${libdir}/plugins/*/*${SOLIBSDEV} \ +" +FILES_${PN}-mkspecs += "\ + ${libdir}/${QT_DIR_NAME}/mkspecs \ + ${libdir}/mkspecs \ +" FILES_${PN} += " \ ${libdir}/${QT_DIR_NAME}/lib*${SOLIBS} \ + ${libdir}/lib*${SOLIBS} \ " FILES_${PN}-dev += " \ ${libdir}/${QT_DIR_NAME}/pkgconfig \ @@ -97,14 +114,20 @@ FILES_${PN}-dev += " \ ${libdir}/${QT_DIR_NAME}/*.la \ ${datadir}/${QT_DIR_NAME}/* \ ${includedir}/${QT_DIR_NAME}/* \ + ${libdir}/pkgconfig \ + ${libdir}/cmake/* \ + ${libdir}/*.prl \ + ${libdir}/*.la \ + ${datadir}/* \ + ${includedir}/* \ " FILES_${PN}-dbg += " \ ${libdir}/${QT_DIR_NAME}/.debug \ ${libdir}/${QT_DIR_NAME}/lib*${SOLIBSDEV} \ + ${libdir}/.debug \ + ${libdir}/lib*${SOLIBSDEV} \ " FILES_${PN}-staticdev += " \ ${libdir}/${QT_DIR_NAME}/*.a \ -" -FILES_${PN}-mkspecs += "\ - ${libdir}/${QT_DIR_NAME}/mkspecs \ + ${libdir}/*.a \ " diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index bc95d244..9487f7e9 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -107,4 +107,4 @@ do_install_append() { } PACKAGES =. "${PN}-fonts " -FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts" +FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts" |