[oe] [PATCH] qt4-embedded: rename qtdemo file

[Marco Cavallini]

Denys Dmytriyenko ha scritto, Il 03/06/2010 18:50:
> On Thu, Jun 03, 2010 at 05:50:06PM +0200, Koen Kooi wrote:
> On 03-06-10 17:15, Chase Maupin wrote:
>>>> * Changed the name of the qtdemo exectable installed
>>>>   in the /usr/bin directory to qtdemoE for Qt
>>>>   embedded builds.  This allows the Qt embedded
>>>>   version of the demos package to co-exist with
>>>>   the Qt X11 version.
>>>> * Changed the demos package file list to accept
>>>>   both qtdemo and qtdemoE.
>>>>
>>>> Signed-off-by: Chase Maupin <chase.maupin at ti.com>
> Acked-by: Koen Kooi <k-kooi at ti.com>
> 
>> Applied, thanks.
> 
>>>> ---
>>>>  recipes/qt4/qt-4.6.2.inc     |    3 +++
>>>>  recipes/qt4/qt4-embedded.inc |    2 +-
>>>>  recipes/qt4/qt4.inc          |    4 ++--
>>>>  3 files changed, 6 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.2.inc
>>>> index e89cf17..4a9f077 100644
>>>> --- a/recipes/qt4/qt-4.6.2.inc
>>>> +++ b/recipes/qt4/qt-4.6.2.inc
>>>> @@ -57,6 +57,9 @@ do_install_append() {
>>>>  	for i in rcc uic moc ; do
>>>>  		install -m 0755 ${S}/bin/$i ${D}${bindir}/
>>>>  	done
>>>> +
>>>> +	#Append an E to the qtdemo file
>>>> +	mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
>>>>  }
>>>>  

This patch drive to an error with qt/X11
ERROR: Build of
/home/koan/devel/openembedded/recipes/qt4/qt4-x11-free_4.6.2.bb
do_install fail

| mv:
`/home/koan/devel/build/kaeilos/tmp/work/armv5te-oe-linux-gnueabi/qt4-x11-free-4.6.2-r17.2/image/usr/bin/qtdemo'
and
`/home/koan/devel/build/kaeilos/tmp/work/armv5te-oe-linux-gnueabi/qt4-x11-free-4.6.2-r17.2/image/usr/bin/qtdemo'
are the same file

looks like the Append an E to the qtdemo file han not been tested with
qt/X11, so I'd like to change recipes/qt4/qt-4.6.2.inc in this way

#Append an E to the qtdemo file
if [${QT_LIBINFIX} == "E"] ; then
	    mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
fi


--
Marco Cavallini | KOAN sas | Bergamo - Italia
 embedded and real-time software engineering
   Atmel third party certified consultant
Phone:+39-035-255.235 - Fax:+39-178-22.39.748
      http://www.KoanSoftware.com
        http://www.KaeilOS.com