diff mbox

[oe,meta-oe] opencv: fix packaging and install

Message ID 1476117065-12316-1-git-send-email-ross.burton@intel.com
State Accepted
Commit fded4cf6a8cf1ff065af97f3283b55aeba458d28
Headers show

Commit Message

Ross Burton Oct. 10, 2016, 4:31 p.m. UTC 
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.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta-oe/recipes-support/opencv/opencv_3.1.bb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

-- 
2.8.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Comments

Ross Burton Oct. 11, 2016, 9:37 a.m. UTC | #1 
On 11 October 2016 at 09:24, Martin Jansa <martin.jansa@gmail.com> wrote:

> On Mon, Oct 10, 2016 at 05:31:05PM +0100, Ross Burton wrote:

> > The OpenCV*.cmake files and the static library should be in the

> opencv-dev

> > 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
-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox

Patch

diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index da11316..2136b07 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -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
 }