* [PATCH] qt4-embedded: rename qtdemo file
@ 2010-06-03 15:15 Chase Maupin
2010-06-03 15:50 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Chase Maupin @ 2010-06-03 15:15 UTC (permalink / raw)
To: openembedded-devel; +Cc: Chase Maupin
* 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@ti.com>
---
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}
}
LICENSE = "LGPLv2.1 GPLv3"
diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
index 9aaca6e..436f64c 100644
--- a/recipes/qt4/qt4-embedded.inc
+++ b/recipes/qt4/qt4-embedded.inc
@@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
DEPENDS += "directfb tslib"
-INC_PR = "r19"
+INC_PR = "r20"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 5a19f65..e246e17 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -103,8 +103,8 @@ FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
-FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*"
-FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
+FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
+FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
--
1.5.4.3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] qt4-embedded: rename qtdemo file
2010-06-03 15:15 [PATCH] qt4-embedded: rename qtdemo file Chase Maupin
@ 2010-06-03 15:50 ` Koen Kooi
2010-06-03 16:50 ` Denys Dmytriyenko
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2010-06-03 15:50 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
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@ti.com>
Acked-by: Koen Kooi <k-kooi@ti.com>
> ---
> 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}
> }
>
> LICENSE = "LGPLv2.1 GPLv3"
> diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
> index 9aaca6e..436f64c 100644
> --- a/recipes/qt4/qt4-embedded.inc
> +++ b/recipes/qt4/qt4-embedded.inc
> @@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
> PRIORITY = "optional"
> HOMEPAGE = "http://www.trolltech.com"
> DEPENDS += "directfb tslib"
> -INC_PR = "r19"
> +INC_PR = "r20"
>
> QT_BASE_NAME ?= "qt4-embedded"
> QT_BASE_LIB ?= "libqt-embedded"
> diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
> index 5a19f65..e246e17 100644
> --- a/recipes/qt4/qt4.inc
> +++ b/recipes/qt4/qt4.inc
> @@ -103,8 +103,8 @@ FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
> FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
> FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
> FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
> -FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*"
> -FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
> +FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
> FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
> FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMB88uMkyGM64RGpERAvNNAJ9dxgbS0or8dffW2g3EyQDgy2+YLACeKsUl
aw4UUGIRN8dpTA3Y694MOFY=
=YC+E
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qt4-embedded: rename qtdemo file
2010-06-03 15:50 ` Koen Kooi
@ 2010-06-03 16:50 ` Denys Dmytriyenko
2010-06-09 13:55 ` Marco Cavallini
0 siblings, 1 reply; 6+ messages in thread
From: Denys Dmytriyenko @ 2010-06-03 16:50 UTC (permalink / raw)
To: openembedded-devel
On Thu, Jun 03, 2010 at 05:50:06PM +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> 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@ti.com>
>
> Acked-by: Koen Kooi <k-kooi@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}
> > }
> >
> > LICENSE = "LGPLv2.1 GPLv3"
> > diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc
> > index 9aaca6e..436f64c 100644
> > --- a/recipes/qt4/qt4-embedded.inc
> > +++ b/recipes/qt4/qt4-embedded.inc
> > @@ -4,7 +4,7 @@ LICENSE = "GPL QPL"
> > PRIORITY = "optional"
> > HOMEPAGE = "http://www.trolltech.com"
> > DEPENDS += "directfb tslib"
> > -INC_PR = "r19"
> > +INC_PR = "r20"
> >
> > QT_BASE_NAME ?= "qt4-embedded"
> > QT_BASE_LIB ?= "libqt-embedded"
> > diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
> > index 5a19f65..e246e17 100644
> > --- a/recipes/qt4/qt4.inc
> > +++ b/recipes/qt4/qt4.inc
> > @@ -103,8 +103,8 @@ FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
> > FILES_${QT_BASE_NAME}-common-dbg = "${bindir}/.debug/qtconfig"
> > FILES_${QT_BASE_NAME}-dbus = "${bindir}/qdbus ${bindir}/qdbusxml2cpp ${bindir}/qdbuscpp2xml ${bindir}/qdbusviewer"
> > FILES_${QT_BASE_NAME}-dbus-dbg = "${bindir}/.debug/qdbus ${bindir}/.debug/qdbusxml2cpp ${bindir}/.debug/qdbuscpp2xml ${bindir}/.debug/qdbusviewer"
> > -FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DIR_NAME}/demos/*"
> > -FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> > +FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/*"
> > +FILES_${QT_BASE_NAME}-demos-dbg = "${bindir}/.debug/qtdemo* ${bindir}/${QT_DIR_NAME}/demos/.debug/* ${bindir}/${QT_DIR_NAME}/demos/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/.debug ${bindir}/${QT_DIR_NAME}/demos/*/*/*/.debug"
> > FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
> > FILES_${QT_BASE_NAME}-designer-dbg = "${bindir}/.debug/*designer*"
> > FILES_${QT_BASE_NAME}-examples = "${bindir}/${QT_DIR_NAME}/examples/*"
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFMB88uMkyGM64RGpERAvNNAJ9dxgbS0or8dffW2g3EyQDgy2+YLACeKsUl
> aw4UUGIRN8dpTA3Y694MOFY=
> =YC+E
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qt4-embedded: rename qtdemo file
2010-06-03 16:50 ` Denys Dmytriyenko
@ 2010-06-09 13:55 ` Marco Cavallini
2010-06-09 14:08 ` Phil Blundell
0 siblings, 1 reply; 6+ messages in thread
From: Marco Cavallini @ 2010-06-09 13:55 UTC (permalink / raw)
To: openembedded-devel
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@ti.com>
> Acked-by: Koen Kooi <k-kooi@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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qt4-embedded: rename qtdemo file
2010-06-09 13:55 ` Marco Cavallini
@ 2010-06-09 14:08 ` Phil Blundell
2010-06-11 16:00 ` Leon Woestenberg
0 siblings, 1 reply; 6+ messages in thread
From: Phil Blundell @ 2010-06-09 14:08 UTC (permalink / raw)
To: openembedded-devel
On Wed, 2010-06-09 at 15:55 +0200, Marco Cavallini wrote:
> #Append an E to the qtdemo file
> if [${QT_LIBINFIX} == "E"] ; then
> mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
> fi
I think you need some quotes around ${QT_LIBINFIX} in the argument to [,
otherwise you are liable to get an error if the variable is empty. It
might also make more sense to test something like '-n "${QT_LIBINFIX"',
rather than testing for it being 'E' specifically. But yes, clearly the
current code is not satisfactory in the case of an empty infix.
p.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] qt4-embedded: rename qtdemo file
2010-06-09 14:08 ` Phil Blundell
@ 2010-06-11 16:00 ` Leon Woestenberg
0 siblings, 0 replies; 6+ messages in thread
From: Leon Woestenberg @ 2010-06-11 16:00 UTC (permalink / raw)
To: openembedded-devel
Hello,
On Wed, Jun 9, 2010 at 4:08 PM, Phil Blundell <philb@gnu.org> wrote:
> On Wed, 2010-06-09 at 15:55 +0200, Marco Cavallini wrote:
>> #Append an E to the qtdemo file
>> if [${QT_LIBINFIX} == "E"] ; then
>> mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
>> fi
>
> I think you need some quotes around ${QT_LIBINFIX} in the argument to [,
> otherwise you are liable to get an error if the variable is empty. It
> might also make more sense to test something like '-n "${QT_LIBINFIX"',
> rather than testing for it being 'E' specifically. But yes, clearly the
> current code is not satisfactory in the case of an empty infix.
>
while we're at it, isn't "-embedded" a much more friendly distinction
that using "E" ?
Regards,
--
Leon
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-06-11 16:05 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-03 15:15 [PATCH] qt4-embedded: rename qtdemo file Chase Maupin
2010-06-03 15:50 ` Koen Kooi
2010-06-03 16:50 ` Denys Dmytriyenko
2010-06-09 13:55 ` Marco Cavallini
2010-06-09 14:08 ` Phil Blundell
2010-06-11 16:00 ` Leon Woestenberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox