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

Submitted by Philip Balister on Dec. 7, 2011, 3:59 p.m.

Details

Message ID 1323273568-31152-2-git-send-email-philip@balister.org
State New
Headers show

Commit Message

Philip Balister Dec. 7, 2011, 3:59 p.m.
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.

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

Signed-off-by: Philip Balister <philip@balister.org>
---
 meta/recipes-qt/qt4/qt4.inc |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index bec81b4..2638249 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -138,8 +138,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"
@@ -287,11 +287,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' \

Comments

Koen Kooi Dec. 7, 2011, 4:23 p.m.
Op 7 dec. 2011, om 16:59 heeft Philip Balister het volgende geschreven:

> 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.
> 
> Test by building gnuradio on the USRP e100 with qt support.
> 
> Signed-off-by: Philip Balister <philip@balister.org>
> ---
> meta/recipes-qt/qt4/qt4.inc |    9 ++-------
> 1 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index bec81b4..2638249 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -138,8 +138,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"
> @@ -287,11 +287,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

Can you verify that those are actually target binaries and not x86 ones?

regards,

Koen
Philip Balister Dec. 7, 2011, 4:44 p.m.
On 12/07/2011 11:23 AM, Koen Kooi wrote:
> 
> Op 7 dec. 2011, om 16:59 heeft Philip Balister het volgende geschreven:
> 
>> 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.
>>
>> Test by building gnuradio on the USRP e100 with qt support.
>>
>> Signed-off-by: Philip Balister <philip@balister.org>
>> ---
>> meta/recipes-qt/qt4/qt4.inc |    9 ++-------
>> 1 files changed, 2 insertions(+), 7 deletions(-)
>>
>> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
>> index bec81b4..2638249 100644
>> --- a/meta/recipes-qt/qt4/qt4.inc
>> +++ b/meta/recipes-qt/qt4/qt4.inc
>> @@ -138,8 +138,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"
>> @@ -287,11 +287,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
> 
> Can you verify that those are actually target binaries and not x86 ones?

root@usrp-e1xx:~# file /usr/bin/lrelease
/usr/bin/lrelease: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripped

root@usrp-e1xx:~# file /usr/bin/rcc
/usr/bin/rcc: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripp

root@usrp-e1xx:~# file /usr/bin/moc
/usr/bin/moc: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripped

root@usrp-e1xx:~# file /usr/bin/uic3
/usr/bin/uic3: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripp

root@usrp-e1xx:~# file /usr/bin/uic
/usr/bin/uic: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripped

Philip

> 
> regards,
> 
> Koen 
> 
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Paul Eggleton Dec. 7, 2011, 5:31 p.m.
On Wednesday 07 December 2011 11:44:10 Philip Balister wrote:
> On 12/07/2011 11:23 AM, Koen Kooi wrote:
> > Op 7 dec. 2011, om 16:59 heeft Philip Balister het volgende geschreven:
> >> 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.
> >> 
> >> Test by building gnuradio on the USRP e100 with qt support.
> >> 
> >> Signed-off-by: Philip Balister <philip@balister.org>
> >> ---
> >> meta/recipes-qt/qt4/qt4.inc |    9 ++-------
> >> 1 files changed, 2 insertions(+), 7 deletions(-)
> >> 
> >> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> >> index bec81b4..2638249 100644
> >> --- a/meta/recipes-qt/qt4/qt4.inc
> >> +++ b/meta/recipes-qt/qt4/qt4.inc
> >> @@ -138,8 +138,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" @@
> >> -287,11 +287,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
> > 
> > Can you verify that those are actually target binaries and not x86 ones?
> 
> root@usrp-e1xx:~# file /usr/bin/lrelease
> /usr/bin/lrelease: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
> dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripped
> 
> root@usrp-e1xx:~# file /usr/bin/rcc
> /usr/bin/rcc: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
> dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripp
> 
> root@usrp-e1xx:~# file /usr/bin/moc
> /usr/bin/moc: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
> dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripped
> 
> root@usrp-e1xx:~# file /usr/bin/uic3
> /usr/bin/uic3: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
> dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripp
> 
> root@usrp-e1xx:~# file /usr/bin/uic
> /usr/bin/uic: ELF 32-bit LSB executable, ARM, version 1 (SYSV),
> dynamically linked (uses shared libs), for GNU/Linux 2.6.16, stripped

I thought this sounded strange when we talked about it on IRC, and looking 
back through the history, commit 69eeb3d2276e5b10d084b47d308ecfc8daf8b467 (by 
me as it happens) added these lines because we were getting architecture 
warnings at packaging time for qt4-x11-free for these specific files. If that's 
no longer the case I'd like to understand why.

Cheers,
Paul