diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-07-05 10:44:55 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 11:28:59 +0100 |
| commit | 69eeb3d2276e5b10d084b47d308ecfc8daf8b467 (patch) | |
| tree | a690bd19e0f96fe78efce082442cb4acda2af0cc /meta/recipes-qt/qt4/qt4.inc | |
| parent | 3cca899bedd168dd43cf297bcbc765c7ca07a9a0 (diff) | |
| download | openembedded-core-69eeb3d2276e5b10d084b47d308ecfc8daf8b467.tar.gz | |
qt4: ensure target packages don't include host binaries
Remove uic, rcc, moc and lrelease from packaged files. This fixes the
following QA warnings:
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/uic
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/rcc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg,
${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/moc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
${WORKDIR}/packages-split/qt4-tools/usr/bin/uic
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
${WORKDIR}/packages-split/qt4-tools/usr/bin/rcc
qt4-x11-free-4.7.3, wrong architecture, qt4-tools,
${WORKDIR}/packages-split/qt4-tools/usr/bin/moc
qt4-x11-free-4.7.3, wrong architecture, qt4-linguist,
${WORKDIR}/packages-split/qt4-linguist/usr/bin/lrelease
These utilities are all provided by qt4-tools-nativesdk in any case.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 7e15b615d9..284586fcfa 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -126,8 +126,8 @@ RRECOMMENDS_${QT_BASE_NAME}-examples += " \ ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ ${QT_BASE_NAME}-plugin-imageformat-jpeg" -FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*" -FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc ${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" +FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" +FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" @@ -267,7 +267,11 @@ do_install() { oe_runmake install INSTALL_ROOT=${D} # These are host binaries, we should only use them in staging - rm -rf ${D}/${bindir}/qmake + rm ${D}/${bindir}/qmake + rm ${D}/${bindir}/uic + rm ${D}/${bindir}/moc + rm ${D}/${bindir}/rcc + rm ${D}/${bindir}/lrelease # fix pkgconfig, libtool and prl files sed -i -e s#-L${S}/lib##g \ @@ -302,11 +306,6 @@ do_install() { install -d ${D}/${libdir}/fonts touch ${D}/${libdir}/fonts/fontdir - install -d ${D}${bindir} - for i in rcc uic moc ; do - install -m 0755 ${S}/bin/$i ${D}${bindir}/ - done - #Append an E to the qtdemo file if [ -n "${QT_LIBINFIX}" ] ; then mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} |