* [PATCH 0/1] Qt4 QA error fix
@ 2011-07-05 10:14 Paul Eggleton
2011-07-05 10:14 ` [PATCH 1/1] qt4: ensure target packages don't include host binaries Paul Eggleton
2011-07-05 10:29 ` [PATCH 0/1] Qt4 QA error fix Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Paul Eggleton @ 2011-07-05 10:14 UTC (permalink / raw)
To: openembedded-core
This patch fixes several "wrong architecture" QA errors when building
qt4-x11-free and qt4-embedded. This is really a stopgap as far as Qt4
packaging goes however, there is still more cleanup work to be done.
The following changes since commit 2b3bf5350861f62435e2fdf1c56c8a02f4b1b4ac:
xauth: upgrade from 1.05 to 1.06 (2011-07-04 12:45:01 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/qt4-qa-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-qa-fix
Paul Eggleton (1):
qt4: ensure target packages don't include host binaries
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 15 +++++++--------
3 files changed, 9 insertions(+), 10 deletions(-)
--
1.7.4.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] qt4: ensure target packages don't include host binaries
2011-07-05 10:14 [PATCH 0/1] Qt4 QA error fix Paul Eggleton
@ 2011-07-05 10:14 ` Paul Eggleton
2011-07-05 10:29 ` [PATCH 0/1] Qt4 QA error fix Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Paul Eggleton @ 2011-07-05 10:14 UTC (permalink / raw)
To: openembedded-core
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>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 15 +++++++--------
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"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r26"
+INC_PR = "r27"
QT_BASE_NAME ?= "qt4-embedded"
QT_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"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r23"
+INC_PR = "r24"
QT_GLFLAGS ?= "-no-opengl"
QT_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 += " \
${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}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 0/1] Qt4 QA error fix
2011-07-05 10:14 [PATCH 0/1] Qt4 QA error fix Paul Eggleton
2011-07-05 10:14 ` [PATCH 1/1] qt4: ensure target packages don't include host binaries Paul Eggleton
@ 2011-07-05 10:29 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-07-05 10:29 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2011-07-05 at 11:14 +0100, Paul Eggleton wrote:
> This patch fixes several "wrong architecture" QA errors when building
> qt4-x11-free and qt4-embedded. This is really a stopgap as far as Qt4
> packaging goes however, there is still more cleanup work to be done.
>
> The following changes since commit 2b3bf5350861f62435e2fdf1c56c8a02f4b1b4ac:
>
> xauth: upgrade from 1.05 to 1.06 (2011-07-04 12:45:01 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib paule/qt4-qa-fix
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-qa-fix
>
> Paul Eggleton (1):
> qt4: ensure target packages don't include host binaries
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-05 10:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-05 10:14 [PATCH 0/1] Qt4 QA error fix Paul Eggleton
2011-07-05 10:14 ` [PATCH 1/1] qt4: ensure target packages don't include host binaries Paul Eggleton
2011-07-05 10:29 ` [PATCH 0/1] Qt4 QA error fix Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.