From 0d0ce836ec33dfac885221493ea4efd392a86961 Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Wed, 14 Dec 2016 00:46:18 +0100 Subject: opencv: Merge dbg packages and Fix QA Issues The presence of more than on -dbg file made completely unusable the rest, and there is no big win by having more than one. Also this qa issue is fixed: QA Issue: opencv-samples-dbg: found library in wrong location: /usr/share/OpenCV/java/.debug/libopencv_java310.so [libdir] Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Martin Jansa --- meta-oe/recipes-support/opencv/opencv_3.1.bb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'meta-oe/recipes-support/opencv') diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 26749ee3a1..2851233c01 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -85,15 +85,15 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" TARGET_CC_ARCH += "-I${S}/include " -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java-dbg ${PN}-java', '', d)} \ +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \ - ${PN}-samples-dbg ${PN}-samples ${PN}-apps" + ${PN}-apps" python populate_packages_prepend () { cv_libdir = d.expand('${libdir}') - cv_libdir_dbg = d.expand('${libdir}/.debug') do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') @@ -111,6 +111,7 @@ python populate_packages_prepend () { d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) metapkg = pn + d.setVar('ALLOW_EMPTY_' + metapkg, "1") blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: @@ -123,17 +124,15 @@ python populate_packages_prepend () { PACKAGES_DYNAMIC += "^libopencv-.*" FILES_${PN} = "" +FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*" +FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake" +FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a" FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake ${datadir}/OpenCV/3rdparty/${baselib}/*.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}-dev = "staticdev" INSANE_SKIP_${PN}-java = "libdir" -INSANE_SKIP_${PN}-java-dbg = "libdir" +INSANE_SKIP_${PN}-dbg = "libdir" ALLOW_EMPTY_${PN} = "1" -- cgit 1.2.3-korg