summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2016-12-14 00:46:18 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-12-26 08:23:21 +0100
commit0d0ce836ec33dfac885221493ea4efd392a86961 (patch)
tree79de07a936cabed0be7afa7ba65c314501cb306a /meta-oe
parent21b4e5b6f636358d641e584874469a318ea5b3ed (diff)
downloadmeta-openembedded-0d0ce836ec33dfac885221493ea4efd392a86961.tar.gz
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 <ricardo.ribalda@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.1.bb19
1 files changed, 9 insertions, 10 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index 26749ee3a..2851233c0 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/"
85 85
86TARGET_CC_ARCH += "-I${S}/include " 86TARGET_CC_ARCH += "-I${S}/include "
87 87
88PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \ 88PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'samples', '${PN}-samples', '', d)} \
89 ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java-dbg ${PN}-java', '', d)} \ 89 ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java', '', d)} \
90 ${@bb.utils.contains('PACKAGECONFIG', 'java', '${PN}-java', '', d)} \
90 ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \ 91 ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'python-${PN}', '', d)} \
91 ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \ 92 ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'python3-${PN}', '', d)} \
92 ${PN}-samples-dbg ${PN}-samples ${PN}-apps" 93 ${PN}-apps"
93 94
94python populate_packages_prepend () { 95python populate_packages_prepend () {
95 cv_libdir = d.expand('${libdir}') 96 cv_libdir = d.expand('${libdir}')
96 cv_libdir_dbg = d.expand('${libdir}/.debug')
97 do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True) 97 do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev', allow_links=True)
98 do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') 98 do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev')
99 do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package', extra_depends='${PN}-dev') 99 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 () {
111 d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends)) 111 d.setVar('RRECOMMENDS_' + metapkg, ' '.join(metapkg_rdepends))
112 112
113 metapkg = pn 113 metapkg = pn
114 d.setVar('ALLOW_EMPTY_' + metapkg, "1")
114 blacklist = [ metapkg ] 115 blacklist = [ metapkg ]
115 metapkg_rdepends = [ ] 116 metapkg_rdepends = [ ]
116 for pkg in packages[1:]: 117 for pkg in packages[1:]:
@@ -123,17 +124,15 @@ python populate_packages_prepend () {
123PACKAGES_DYNAMIC += "^libopencv-.*" 124PACKAGES_DYNAMIC += "^libopencv-.*"
124 125
125FILES_${PN} = "" 126FILES_${PN} = ""
127FILES_${PN}-dbg += "${datadir}/OpenCV/java/.debug/* ${datadir}/OpenCV/samples/bin/.debug/*"
128FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake"
129FILES_${PN}-staticdev += "${datadir}/OpenCV/3rdparty/lib/*.a"
126FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" 130FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV"
127FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake ${datadir}/OpenCV/3rdparty/${baselib}/*.a"
128FILES_${PN}-doc = "${datadir}/OpenCV/doc"
129FILES_${PN}-java = "${datadir}/OpenCV/java" 131FILES_${PN}-java = "${datadir}/OpenCV/java"
130FILES_${PN}-java-dbg = "${datadir}/OpenCV/java/.debug/"
131FILES_${PN}-samples = "${datadir}/OpenCV/samples/" 132FILES_${PN}-samples = "${datadir}/OpenCV/samples/"
132FILES_${PN}-samples-dbg = "${datadir}/OpenCV/samples/bin/.debug"
133 133
134INSANE_SKIP_${PN}-dev = "staticdev"
135INSANE_SKIP_${PN}-java = "libdir" 134INSANE_SKIP_${PN}-java = "libdir"
136INSANE_SKIP_${PN}-java-dbg = "libdir" 135INSANE_SKIP_${PN}-dbg = "libdir"
137 136
138ALLOW_EMPTY_${PN} = "1" 137ALLOW_EMPTY_${PN} = "1"
139 138