qt: package examples
PATCH 1/1 qt: package examples
Signed-off-by Eric Bénard <[email protected]>
--- recipes-qt/qt5/qt5.inc | 9 ++++++++- recipes-qt/qt5/qtbase.inc | 1 + recipes-qt/qt5/qtmultimedia.inc | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-)
recipes-qt/qt5/qt5.inc +8 -1
@@ -20,7 +20,7 @@ OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" -PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " +PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " # extra -dbg packages FILES_${PN}-qmlplugins-dbg = " \
@@ -98,3 +98,10 @@ FILES_${PN}-dbg += " \ FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_LIBS}/*.a \ " + +FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples/*" + +FILES_${PN}-examples-dbg = "${datadir}/${QT_DIR_NAME}/examples/.debug ${datadir}/${QT_DIR_NAME}/examples/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/*/*/*/.debug" +ALLOW_EMPTY_${PN}-examples = "1" +ALLOW_EMPTY_${PN}-examples-staticdev = "1" +ALLOW_EMPTY_${PN}-examples-dbg = "1"
recipes-qt/qt5/qtbase.inc +1 -0
@@ -167,3 +167,4 @@ do_install_append() { PACKAGES =. "${PN}-fonts " FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts" +FILES_${PN}-examples-staticdev = "${datadir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
recipes-qt/qt5/qtmultimedia.inc +4 -0
@@ -3,3 +3,7 @@ require qt5.inc DEPENDS += "qtdeclarative gstreamer alsa-lib " INC_PR = "r0" + +do_install_append() { + rm -f ${D}/${datadir}/${QT_DIR_NAME}/examples/multimedia/spectrum/*.so +}
Signature · 1 line
1.7.10.4
Quoted 21 lines · Eric Bénard
Signed-off-by Eric Bénard <[email protected]>--- recipes-qt/qt5/qt5.inc | 9 ++++++++- recipes-qt/qt5/qtbase.inc | 1 + recipes-qt/qt5/qtmultimedia.inc | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-)recipes-qt/qt5/qt5.inc +1
-1@@ -20,7 +20,7 @@ OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}" OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}" OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}" -PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs " +PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples " # extra -dbg packages FILES_${PN}-qmlplugins-dbg = " \
recipes-qt/qt5/qt5.inc FILES_${PN}-dbg += " \ · line 104
Quoted 7 lines
recipes-qt/qt5/qt5.inc +4
-0@@ -98,3 +98,10 @@ FILES_${PN}-dbg += " \ FILES_${PN}-staticdev += " \ ${OE_QMAKE_PATH_LIBS}/*.a \ " + +FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples/*" + +FILES_${PN}-examples-dbg = "${datadir}/${QT_DIR_NAME}/examples/.debug ${datadir}/${QT_DIR_NAME}/examples/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/*/*/.debug ${datadir}/${QT_DIR_NAME}/examples/*/*/*/*/*/.debug"
Please wrap it to multiple lines so it's easier to see that it's just multiple levels of .debug directories.
recipes-qt/qt5/qt5.inc FILES_${PN}-dbg += " \ · line 107
Quoted 3 lines
recipes-qt/qt5/qt5.inc +3
-0+ALLOW_EMPTY_${PN}-examples = "1" +ALLOW_EMPTY_${PN}-examples-staticdev = "1" +ALLOW_EMPTY_${PN}-examples-dbg = "1"
Do we need to always create them?
recipes-qt/qt5/qtbase.inc do_install_append() { · line 170
Quoted 9 lines
recipes-qt/qt5/qtbase.inc +1
-0@@ -167,3 +167,4 @@ do_install_append() { PACKAGES =. "${PN}-fonts " FILES_${PN}-fonts = "${libdir}/${QT_DIR_NAME}/fonts ${libdir}/fonts" +FILES_${PN}-examples-staticdev = "${datadir}/${QT_DIR_NAME}/examples/tools/plugandpaint/plugins/libpnp_basictools.a"
Shouldn't this go to qt5.inc (with * and *.a)
Quoted 16 lines
recipes-qt/qt5/qtmultimedia.inc +4
-0@@ -3,3 +3,7 @@ require qt5.inc DEPENDS += "qtdeclarative gstreamer alsa-lib " INC_PR = "r0" + +do_install_append() { + rm -f ${D}/${datadir}/${QT_DIR_NAME}/examples/multimedia/spectrum/*.so +}Signature · 1 line
1.7.10.4
Please use OE_QMAKE_PATH_EXAMPLES variable everywhere and add some comment explaining why examples/multimedia/spectrum needs to be removed.
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]