summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-11-13 16:46:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:02:53 +0000
commitd63588ddd5a1f08fff90f5bb3f7278490e359720 (patch)
tree559c742cff012ff02a8e586ece47df697019bff3
parent64030f37b34f75144f53eef42d5822ede79e08bd (diff)
downloadopenembedded-core-contrib-d63588ddd5a1f08fff90f5bb3f7278490e359720.tar.gz
openembedded-core-contrib-d63588ddd5a1f08fff90f5bb3f7278490e359720.tar.bz2
openembedded-core-contrib-d63588ddd5a1f08fff90f5bb3f7278490e359720.zip
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 <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-qt/qt4/qt4.inc4
1 files 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 ?= ""