From b27938bc7ac6ab9eb2c31db15ec787c7b4a5a55d Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda Delgado Date: Thu, 2 Jun 2016 14:49:29 +0200 Subject: 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 Signed-off-by: Ricardo Ribalda Delgado Signed-off-by: Martin Jansa --- 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 c74a44d9e9..36876da2ca 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}') -- cgit v1.2.3-54-g00ecf