Re: [RFC][meta-qt5 3/3] qtwayland: install created private headers

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2768 bytes --]

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
> > <schnitzeltony@googlemail.com> 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 <schnitzeltony@googlemail.com>
> > > ---
> > >  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.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]