[oe-commits] [meta-openembedded] 05/15: opencv: Reorder PACKAGES variable
git at git.openembedded.org
git at git.openembedded.org
Mon Jun 6 11:13:48 UTC 2016
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit 621e0ab8972f71ffe4c63dbcd85094e8f3943626
Author: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
AuthorDate: Thu Jun 2 14:49:29 2016 +0200
opencv: Reorder PACKAGES variable
PACKAGES content order is important, because it determines the
destination of the files, when the folders overlaps.
Without this patch:
NOTE: Executing RunQueue Tasks
ERROR: QA Issue: non debug package contains .debug directory:
opencv-apps path
packages-split/opencv-apps/usr/share/OpenCV/java/.debug/libopencv_java310.so
[debug-files]
WARNING: QA Issue: opencv-apps: found library in wrong location:
/usr/share/OpenCV/java/libopencv_java310.so
opencv-apps: found library in wrong location:
/usr/share/OpenCV/java/.debug/libopencv_java310.so [libdir]
ERROR: QA run found fatal errors. Please consider fixing them.
ERROR: Function failed: do_package_qa
Fixes: 3132af1d1d15 ("opencv: Fix metapkg dependencies for opencv-java ... ")
Acked-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/opencv/opencv_3.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index c74a44d..36876da 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -78,8 +78,8 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
TARGET_CC_ARCH += "-I${S}/include "
-PACKAGES += "${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv \
- ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)}"
+PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \
+ ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv"
python populate_packages_prepend () {
cv_libdir = d.expand('${libdir}')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list