opencv: fix packaging and install
PATCH 1/1 opencv: fix packaging and install
The OpenCV*.cmake files and the static library should be in the opencv-dev package, not opencv-apps.
There is no need to specify files for PN-dbg as they're automatically found, so remove the FILES_PN-dbg assignment.
Conditionalise the installation of the example and tutorial binaries so it doesn't abort if samples are disabled.
--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +6 -5
@@ -116,15 +116,14 @@ PACKAGES_DYNAMIC += "^libopencv-.*" FILES_${PN} = "" FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake ${datadir}/OpenCV/3rdparty/lib/*.a" FILES_${PN}-doc = "${datadir}/OpenCV/doc" FILES_${PN}-java = "${datadir}/OpenCV/java" FILES_${PN}-java-dbg = "${datadir}/OpenCV/java/.debug/" FILES_${PN}-samples = "${datadir}/OpenCV/samples/" FILES_${PN}-samples-dbg = "${datadir}/OpenCV/samples/bin/.debug" -INSANE_SKIP_${PN}-apps = "staticdev" +INSANE_SKIP_${PN}-dev = "staticdev" INSANE_SKIP_${PN}-java = "libdir" INSANE_SKIP_${PN}-java-dbg = "libdir"
@@ -144,6 +143,8 @@ do_install_append() { rm -rf ${D}/usr/lib fi - install -d ${D}${datadir}/OpenCV/samples/bin/ - cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ + if ${@bb.utils.contains("PACKAGECONFIG", "samples", "true", "false", d)}; then + install -d ${D}${datadir}/OpenCV/samples/bin/ + cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ + fi }
Signature · 1 line
2.8.1
Quoted 2 lines · Ross Burton
The OpenCV*.cmake files and the static library should be in the opencv-dev package, not opencv-apps.
Why not PN-staticdev?
Quoted 52 lines
There is no need to specify files for PN-dbg as they're automatically found, so remove the FILES_PN-dbg assignment.
Conditionalise the installation of the example and tutorial binaries so it doesn't abort if samples are disabled.
Signed-off-by Ross Burton <[email protected]>--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)meta-oe/recipes-support/opencv/opencv_3.1.bb +6
-5@@ -116,15 +116,14 @@ PACKAGES_DYNAMIC += "^libopencv-.*" FILES_${PN} = "" FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" -FILES_${PN}-dbg += "${libdir}/.debug" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake ${datadir}/OpenCV/3rdparty/lib/*.a" FILES_${PN}-doc = "${datadir}/OpenCV/doc" FILES_${PN}-java = "${datadir}/OpenCV/java" FILES_${PN}-java-dbg = "${datadir}/OpenCV/java/.debug/" FILES_${PN}-samples = "${datadir}/OpenCV/samples/" FILES_${PN}-samples-dbg = "${datadir}/OpenCV/samples/bin/.debug" -INSANE_SKIP_${PN}-apps = "staticdev" +INSANE_SKIP_${PN}-dev = "staticdev" INSANE_SKIP_${PN}-java = "libdir" INSANE_SKIP_${PN}-java-dbg = "libdir"@@ -144,6 +143,8 @@ do_install_append() { rm -rf ${D}/usr/lib fi - install -d ${D}${datadir}/OpenCV/samples/bin/ - cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ + if ${@bb.utils.contains("PACKAGECONFIG", "samples", "true", "false", d)}; then + install -d ${D}${datadir}/OpenCV/samples/bin/ + cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ + fi }Signature · 7 lines
2.8.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Quoted 7 lines · Martin Jansa
Quoted 1 line · Ross Burton
The OpenCV*.cmake files and the static library should be in the
opencv-dev
Quoted 1 line
package, not opencv-apps.
Why not PN-staticdev?
I've not actually used opencv but it appears that his static library isn't a static form of the main libraries but an auxiliary library that only comes in static form.
Ross