From d63588ddd5a1f08fff90f5bb3f7278490e359720 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 13 Nov 2013 16:46:07 +0800 Subject: lib32-qt4-examples: fix QA warnings and INSANE_SKIP not work Fix the following warnings: ... lib32-qt4-examples: found library in wrong location: /usr/bin/qt4/examples/tools/echoplugin/plugin/libechoplugin.so lib32-qt4-examples: found library in wrong location: /usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so ... In oe-core f119566477243ce43b727492dc78b9cb3dd76de4, it added INSANE_SKIP libdir for examples packages as it includes plugin shared libraries outside of libdir. But it hardcoded ${QT_BASE_NAME} as INSANE_SKIP's package name and it didn't work while multilib enabled. Add ${MLPREFIX} as package name's prefix in INSANE_SKIP [YOCTO #5516] Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold --- meta/recipes-qt/qt4/qt4.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 6adc4042c8..293eb8786c 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -185,8 +185,8 @@ FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" -INSANE_SKIP_${QT_BASE_NAME}-examples += "libdir" -INSANE_SKIP_${QT_BASE_NAME}-examples-dbg += "libdir" +INSANE_SKIP_${MLPREFIX}${QT_BASE_NAME}-examples += "libdir" +INSANE_SKIP_${MLPREFIX}${QT_BASE_NAME}-examples-dbg += "libdir" # License options, to be set by the recipe if different values are needed QT_LICENSE_FILE ?= "" -- cgit 1.2.3-korg