From ead5cb4ed7dab28ba4fd3789b2400b4d0d062ba5 Mon Sep 17 00:00:00 2001 From: Zheng Ruoqin Date: Fri, 3 Jul 2020 11:19:18 +0800 Subject: upm:Fix build error when enable multilib. ERROR: upm-2.0.0+gitAUTOINC+5cf20df96c-r0 do_package: QA Issue: upm: Files/directories were installed but not shipped in any package: /usr/lib/python3.8/site-packages/upm/pyupm_adc121c021.py /usr/lib/python3.8/site-packages/upm/pyupm_hmc5883l.py /usr/lib/python3.8/site-packages/upm/_pyupm_mma8x5x.so /usr/lib/python3.8/site-packages/upm/_pyupm_m24lr64e.so /usr/lib/python3.8/site-packages/upm/pyupm_tca9548a.py /usr/lib/python3.8/site-packages/upm/pyupm_mb704x.py /usr/lib/python3.8/site-packages/upm/_pyupm_ehr.so ...... Signed-off-by: Zheng Ruoqin Signed-off-by: Khem Raj (cherry picked from commit efe14bb04e58dd2028ba7c1521f08e2bd5382130) Signed-off-by: Armin Kuster --- meta-oe/recipes-extended/upm/upm_git.bb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-oe/recipes-extended') diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 5b3585c141..6a7611f382 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -46,6 +46,10 @@ PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', PACKAGECONFIG[python] = "-DBUILDSWIGPYTHON=ON -DPYTHON_LIBRARY=${STAGING_LIBDIR}/lib${PYTHON_DIR}${PYTHON_ABI}.so -DPYTHON_INCLUDE_DIR=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}, -DBUILDSWIGPYTHON=OFF, swig-native ${PYTHON_PN}," PACKAGECONFIG[nodejs] = "-DBUILDSWIGNODE=ON, -DBUILDSWIGNODE=OFF, swig-native nodejs-native," +do_configure_prepend() { + sed -i s:\"lib/${_packages_path}:\"${baselib}/${_packages_path}:g ${S}/cmake/modules/OpenCVDetectPython.cmake +} + FILES_${PYTHON_PN}-${PN} = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS_${PYTHON_PN}-${PN} += "${PYTHON_PN}" -- cgit 1.2.3-korg