re-enable packaging of qt4 tools

PATCH Applied Paul Eggleton 2 participants 3 messages Dec 12, 2011 – Dec 13, 2011

Share & tools

Paul Eggleton

author

2011-12-12 18:55 UTC #0 lore raw

cover re-enable packaging of qt4 tools

I'm still unable to explain why we were getting architecture warnings about these binaries before and we don't now. It could be something to do with the updated version of Qt we are building, or it could be something else. In any case building for two architectures produced no warnings and the binaries are in the correct format.

The following changes since commit c9a420be15d54a8494cb45d6c932b86895e94e13:

connman: Default to enabling ethernet interfaces (2011-12-12 16:50:21 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/qt4-tools
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/qt4-tools

Philip Balister (1):
qt4.inc : Add uic, moc, rcc, and lrelease to tools package.

 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

Signature · 1 line

1.7.5.4

Paul Eggleton

author

2011-12-12 18:55 UTC #1 lore raw

PATCH 1/1 qt4.inc : Add uic, moc, rcc, and lrelease to tools package.

From: Philip Balister <[email protected]>

These binaries are needed in the target tools package so we can build qt apps on the target. You also need to install qmake from meta-oe.

Tested by building gnuradio on the USRP e100 with qt support.

(This effectively reverses OE-core rev 69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for qemux86 and qemumips produced no packaging warnings such as those described in that commit, and the architecture of the executables is correct.)

Signed-off-by Philip Balister <[email protected]>

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

meta/recipes-qt/qt4/qt4-embedded.inc +1 -1

index 06b2432..39f7398 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r38"
+INC_PR = "r39"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"

meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1

index 53a44ad..5b93a98 100644
@@ -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 = "r35"
+INC_PR = "r36"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"

meta/recipes-qt/qt4/qt4.inc +2 -7

index 3155cbb..87a12e6 100644
@@ -142,8 +142,8 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
 RRECOMMENDS_${QT_BASE_NAME}-doc += " \
             ${QT_BASE_NAME}-demos-doc"
 
-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}-tools                = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
+FILES_${QT_BASE_NAME}-tools-dbg            = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
 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"

@@ -291,11 +291,6 @@ do_install() {
 
 	# These are host binaries, we should only use them in staging
 	rm ${D}/${bindir}/qmake
-	rm -f ${D}/${bindir}/uic
-	rm -f ${D}/${bindir}/uic3
-	rm ${D}/${bindir}/moc
-	rm ${D}/${bindir}/rcc
-	rm -f ${D}/${bindir}/lrelease
 
 	# fix pkgconfig, libtool and prl files
 	sed -i -e 's#-L${S}/lib/\?##g' \

Signature · 1 line

1.7.5.4

Richard Purdie

Applied

2011-12-13 12:39 UTC #2 lore raw

Re: [PATCH 1/1] qt4.inc : Add uic, moc, rcc, and lrelease to tools package.

Quoted 13 lines · Paul Eggleton

From: Philip Balister <[email protected]>
These binaries are needed in the target tools package so we can build qt apps on the target. You also need to install qmake from meta-oe.
Tested by building gnuradio on the USRP e100 with qt support.
(This effectively reverses OE-core rev 69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for qemux86 and qemumips produced no packaging warnings such as those described in that commit, and the architecture of the executables is correct.)

Quoted 7 lines

Signed-off-by Philip Balister <[email protected]>
Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    9 ++-------
 3 files changed, 4 insertions(+), 9 deletions(-)

Merged to master, thanks.

Richard