Re: [oe] [RFC][meta-qt5 3/3] qtwayland: install created private headers
On Tue, May 13, 2014 at 10:42 AM, Martin Jansa wrote:
> On Tue, May 13, 2014 at 08:57:00AM +0200, Martin Jansa wrote:
>> On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
>> > On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
>> > wrote:
>> > > buildhistory diff:
>> > > ---
>> > > a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > > +++
>> > > b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>> > > RPROVIDES =
>> > > RDEPENDS = qtwayland
>> > > RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev
>> > > qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
>> > > -PKGSIZE = 295533
>> > > +PKGSIZE = 537651
>> > > FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la
>> > > /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal
>> > > /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
>> > > -FILELIST =
>> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h
>> > >
>> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
>> > > +FILELIST =
>> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h
>> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>> > >
>> > > Signed-off-by: Andreas Müller
>> > > ---
>> > > recipes-qt/qt5/qtwayland_git.bb | 5 +
>> > > 1 file changed, 5 insertions(+)
>> > >
>> > > diff --git a/recipes-qt/qt5/qtwayland_git.bb
>> > > b/recipes-qt/qt5/qtwayland_git.bb
>> > > index ebdda82..8da8249 100644
>> > > --- a/recipes-qt/qt5/qtwayland_git.bb
>> > > +++ b/recipes-qt/qt5/qtwayland_git.bb
>> > > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>> > > SRC_URI += " \
>> > >
>> > > file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>> > > "
>> > > +
>> > > +do_install_append() {
>> > > + # do install files created by qtwaylandscanner
>> > > + install
>> > > ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h
>> > > ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
>> > Aargh: Wrong directory did test with /usr/include and expected
>> > includedir = /usr/include -> V2 will follow
>>
>> fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
>> cherry-picking to master-next
>
> Fails in world builds with dash:
>
> | install: cannot stat
> `/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwayland/5.2.1+gitAUTOINC+f9ebbd6c61-r0/build/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h':
> No such file or directory
Yes I was afraid this would happen last night - but was too dizzy to
realize why. It was caused by a patch I had in temporary which pinned
qtwayland to 5.2.1. I will send V2 with 5.3.0 and spaces in
do_install_append. Sorry for causing extra efforts.
Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [RFC][meta-qt5 3/3] qtwayland: install created private headers
On Tue, May 13, 2014 at 08:57:00AM +0200, Martin Jansa wrote:
> On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
> > On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
> > wrote:
> > > buildhistory diff:
> > > ---
> > > a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > > +++
> > > b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
> > > RPROVIDES =
> > > RDEPENDS = qtwayland
> > > RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev
> > > qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
> > > -PKGSIZE = 295533
> > > +PKGSIZE = 537651
> > > FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la
> > > /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal
> > > /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
> > > -FILELIST =
> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h
> > >
> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
> > > +FILELIST =
> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h
> > > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
> > >
> > > Signed-off-by: Andreas Müller
> > > ---
> > > recipes-qt/qt5/qtwayland_git.bb | 5 +
> > > 1 file changed, 5 insertions(+)
> > >
> > > diff --git a/recipes-qt/qt5/qtwayland_git.bb
> > > b/recipes-qt/qt5/qtwayland_git.bb
> > > index ebdda82..8da8249 100644
> > > --- a/recipes-qt/qt5/qtwayland_git.bb
> > > +++ b/recipes-qt/qt5/qtwayland_git.bb
> > > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
> > > SRC_URI += " \
> > >
> > > file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
> > > "
> > > +
> > > +do_install_append() {
> > > + # do install files created by qtwaylandscanner
> > > + install
> > > ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h
> > > ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
> > Aargh: Wrong directory did test with /usr/include and expected
> > includedir = /usr/include -> V2 will follow
>
> fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
> cherry-picking to master-next
Fails in world builds with dash:
| install: cannot stat
`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtwayland/5.2.1+gitAUTOINC+f9ebbd6c61-r0/build/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h':
No such file or directory
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [RFC][meta-qt5 3/3] qtwayland: install created private headers
On Tue, May 13, 2014 at 8:57 AM, Martin Jansa wrote:
> On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
>> On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
>> wrote:
>> > buildhistory diff:
>> > ---
>> > a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > +++
>> > b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>> > RPROVIDES =
>> > RDEPENDS = qtwayland
>> > RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev
>> > qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
>> > -PKGSIZE = 295533
>> > +PKGSIZE = 537651
>> > FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la
>> > /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal
>> > /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
>> > -FILELIST =
>> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h
>> >
>> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
>> > +FILELIST =
>> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h
>> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>> >
>> > Signed-off-by: Andreas Müller
>> > ---
>> > recipes-qt/qt5/qtwayland_git.bb | 5 +
>> > 1 file changed, 5 insertions(+)
>> >
>> > diff --git a/recipes-qt/qt5/qtwayland_git.bb
>> > b/recipes-qt/qt5/qtwayland_git.bb
>> > index ebdda82..8da8249 100644
>> > --- a/recipes-qt/qt5/qtwayland_git.bb
>> > +++ b/recipes-qt/qt5/qtwayland_git.bb
>> > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>> > SRC_URI += " \
>> >
>> > file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>> > "
>> > +
>> > +do_install_append() {
>> > + # do install files created by qtwaylandscanner
>> > + install
>> > ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h
>> > ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
>> Aargh: Wrong directory did test with /usr/include and expected
>> includedir = /usr/include -> V2 will follow
>
> fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
> cherry-picking to master-next
Thanks - hope to get that next time...
Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [RFC][meta-qt5 3/3] qtwayland: install created private headers
On Tue, May 13, 2014 at 02:17:07AM +0200, Andreas Müller wrote:
> On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
> wrote:
> > buildhistory diff:
> > ---
> > a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > +++
> > b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> > @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
> > RPROVIDES =
> > RDEPENDS = qtwayland
> > RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev
> > qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
> > -PKGSIZE = 295533
> > +PKGSIZE = 537651
> > FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la
> > /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal
> > /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
> > -FILELIST =
> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h
> >
> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
> > +FILELIST =
> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h
> > /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
> >
> > Signed-off-by: Andreas Müller
> > ---
> > recipes-qt/qt5/qtwayland_git.bb | 5 +
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/recipes-qt/qt5/qtwayland_git.bb
> > b/recipes-qt/qt5/qtwayland_git.bb
> > index ebdda82..8da8249 100644
> > --- a/recipes-qt/qt5/qtwayland_git.bb
> > +++ b/recipes-qt/qt5/qtwayland_git.bb
> > @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
> > SRC_URI += " \
> > file://0001-examples.pro-include-server-buffer-only-when-buildin.patch
> > \
> > "
> > +
> > +do_install_append() {
> > + # do install files created by qtwaylandscanner
> > + install
> > ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h
> > ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
> Aargh: Wrong directory did test with /usr/include and expected
> includedir = /usr/include -> V2 will follow
fwiw: 2/3 and 3/3 were using tabs in do_install, I've fixed it when
cherry-picking to master-next
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [RFC][meta-qt5 3/3] qtwayland: install created private headers
On Tue, May 13, 2014 at 2:17 AM, Andreas Müller
wrote:
> On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
> wrote:
>> buildhistory diff:
>> ---
>> a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> +++
>> b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
>> @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
>> RPROVIDES =
>> RDEPENDS = qtwayland
>> RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev
>> qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
>> -PKGSIZE = 295533
>> +PKGSIZE = 537651
>> FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la
>> /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal
>> /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
>> -FILELIST =
>> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h
>>
>> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
>> +FILELIST =
>> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h
>> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>>
>> Signed-off-by: Andreas Müller
>> ---
>> recipes-qt/qt5/qtwayland_git.bb | 5 +
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/recipes-qt/qt5/qtwayland_git.bb
>> b/recipes-qt/qt5/qtwayland_git.bb
>> index ebdda82..8da8249 100644
>> --- a/recipes-qt/qt5/qtwayland_git.bb
>> +++ b/recipes-qt/qt5/qtwayland_git.bb
>> @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
>> SRC_URI += " \
>> file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
>> "
>> +
>> +do_install_append() {
>> + # do install files created by qtwaylandscanner
>> + install
>> ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h
>> ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
> Aargh: Wrong directory did test with /usr/include and expected
> includedir = /usr/include -> V2 will follow
I should stop for today -> my error here was caused by updating QT
installing to 5.3.0 - patch should work - no V2 - sorry for the noise
>
> Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [RFC][meta-qt5 3/3] qtwayland: install created private headers
On Mon, May 12, 2014 at 11:41 AM, Andreas Müller
wrote:
> buildhistory diff:
> ---
> a/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> +++
> b/packages/armv7at2hf-vfp-neon-angstrom_wl-linux-gnueabi/qtwayland/qtwayland-dev/latest
> @@ -4,6 +4,6 @@ PKGV = 5.2.1+git0+f9ebbd6c61
> RPROVIDES =
> RDEPENDS = qtwayland
> RRECOMMENDS = eglibc-dev libgcc-dev libstdc++-dev libxkbcommon-dev
> qtbase-dev qtdeclarative-dev wayland-dev xproto-dev zlib-dev
> -PKGSIZE = 295533
> +PKGSIZE = 537651
> FILES = /usr/include /lib/lib*.so /usr/lib/lib*.so /usr/lib/*.la
> /usr/lib/*.o /usr/lib/pkgconfig /usr/share/pkgconfig /usr/share/aclocal
> /lib/*.o /usr/lib/qtwayland/*.la /lib/*.la
> -FILELIST =
> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegration_p.h
>
> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlclientbufferintegrat
> +FILELIST =
> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server-hardware-integration.h
> /usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwayland-server
>
> Signed-off-by: Andreas Müller
> ---
> recipes-qt/qt5/qtwayland_git.bb | 5 +
> 1 file changed, 5 insertions(+)
>
> diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
> index ebdda82..8da8249 100644
> --- a/recipes-qt/qt5/qtwayland_git.bb
> +++ b/recipes-qt/qt5/qtwayland_git.bb
> @@ -9,3 +9,8 @@ SRCREV = "f9ebbd6c618488f9b671f5504528ced3350754fb"
> SRC_URI += " \
> file://0001-examples.pro-include-server-buffer-only-when-buildin.patch \
> "
> +
> +do_install_append() {
> + # do install files created by qtwaylandscanner
> + install
> ${B}/include/QtCompositor/5.2.1/QtCompositor/private/{qwayland-server-*,*protocol*}.h
> ${D}${includedir}/${QT_DIR_NAME}/QtCompositor/5.2.1/QtCompositor/private
Aargh: Wrong directory did test with /usr/include and expected
includedir = /usr/include -> V2 will follow
Andreas
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
