summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-05 09:44:55 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 10:39:11 (GMT)
commit0da7db18f1070d46eceb232efe2ae04394a6688a (patch)
treece49c5eb87f587844368c48befdbd95240d37ae1 /meta/recipes-qt
parentcb5811bf0e909feeef708337c82c5e2836adb2f3 (diff)
downloadpoky-0da7db18f1070d46eceb232efe2ae04394a6688a.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. (From OE-Core rev: 69eeb3d2276e5b10d084b47d308ecfc8daf8b467) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc15
3 files changed, 9 insertions, 10 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index fc02fe0..de311dc 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
3LICENSE = "LGPLv2.1 | GPLv3" 3LICENSE = "LGPLv2.1 | GPLv3"
4HOMEPAGE = "http://qt.nokia.com" 4HOMEPAGE = "http://qt.nokia.com"
5DEPENDS += "directfb tslib" 5DEPENDS += "directfb tslib"
6INC_PR = "r26" 6INC_PR = "r27"
7 7
8QT_BASE_NAME ?= "qt4-embedded" 8QT_BASE_NAME ?= "qt4-embedded"
9QT_BASE_LIB ?= "libqt-embedded" 9QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 87145a3..7a30af6 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r23" 8INC_PR = "r24"
9 9
10QT_GLFLAGS ?= "-no-opengl" 10QT_GLFLAGS ?= "-no-opengl"
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 7e15b61..284586f 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -126,8 +126,8 @@ RRECOMMENDS_${QT_BASE_NAME}-examples += " \
126 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \ 126 ${QT_BASE_NAME}-plugin-sqldriver-sqlite \
127 ${QT_BASE_NAME}-plugin-imageformat-jpeg" 127 ${QT_BASE_NAME}-plugin-imageformat-jpeg"
128 128
129FILES_${QT_BASE_NAME}-tools = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay ${bindir}/qdoc*" 129FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*"
130FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc ${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" 130FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*"
131FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" 131FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
132FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" 132FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
133FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" 133FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
@@ -267,7 +267,11 @@ do_install() {
267 oe_runmake install INSTALL_ROOT=${D} 267 oe_runmake install INSTALL_ROOT=${D}
268 268
269 # These are host binaries, we should only use them in staging 269 # These are host binaries, we should only use them in staging
270 rm -rf ${D}/${bindir}/qmake 270 rm ${D}/${bindir}/qmake
271 rm ${D}/${bindir}/uic
272 rm ${D}/${bindir}/moc
273 rm ${D}/${bindir}/rcc
274 rm ${D}/${bindir}/lrelease
271 275
272 # fix pkgconfig, libtool and prl files 276 # fix pkgconfig, libtool and prl files
273 sed -i -e s#-L${S}/lib##g \ 277 sed -i -e s#-L${S}/lib##g \
@@ -302,11 +306,6 @@ do_install() {
302 install -d ${D}/${libdir}/fonts 306 install -d ${D}/${libdir}/fonts
303 touch ${D}/${libdir}/fonts/fontdir 307 touch ${D}/${libdir}/fonts/fontdir
304 308
305 install -d ${D}${bindir}
306 for i in rcc uic moc ; do
307 install -m 0755 ${S}/bin/$i ${D}${bindir}/
308 done
309
310 #Append an E to the qtdemo file 309 #Append an E to the qtdemo file
311 if [ -n "${QT_LIBINFIX}" ] ; then 310 if [ -n "${QT_LIBINFIX}" ] ; then
312 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX} 311 mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}