[1/2] wayland: upgrade to 1.15.0

Message ID 1523387170-30191-1-git-send-email-denis@denix.org
State New
Headers show
Series
  • [1/2] wayland: upgrade to 1.15.0
Related show

Commit Message

Denys Dmytriyenko April 10, 2018, 7:06 p.m.
From: Denys Dmytriyenko <denys@ti.com>


Official announcement:
https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html

| libwayland-egl is now part of libwayland, and will presumably be removed
| from mesa in the not too distant future.

Update mesa recipe by removing corresponding libwayland-egl entries.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

---
 meta/recipes-graphics/mesa/mesa.inc                                | 7 ++++---
 .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}               | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} (92%)

-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Martin Jansa May 8, 2018, 9:18 p.m. | #1
On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>

> 

> Official announcement:

> https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html

> 

> | libwayland-egl is now part of libwayland, and will presumably be removed

> | from mesa in the not too distant future.

> 

> Update mesa recipe by removing corresponding libwayland-egl entries.

> 

> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> ---

>  meta/recipes-graphics/mesa/mesa.inc                                | 7 ++++---

>  .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}               | 4 ++--

>  2 files changed, 6 insertions(+), 5 deletions(-)

>  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} (92%)

> 

> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc

> index b501b7e..c3a8e76 100644

> --- a/meta/recipes-graphics/mesa/mesa.inc

> +++ b/meta/recipes-graphics/mesa/mesa.inc

> @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

>               libgles1-mesa libgles1-mesa-dev \

>               libgles2-mesa libgles2-mesa-dev \

>               libgles3-mesa libgles3-mesa-dev \

> -             libwayland-egl libwayland-egl-dev \

>               libxatracker libxatracker-dev \

>               mesa-megadriver mesa-vulkan-drivers \

>              "

> @@ -134,6 +133,10 @@ do_install_append () {

>      # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 

>      rm -f ${D}${sysconfdir}/drirc

>      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

> +

> +    # libwayland-egl has been moved to wayland 1.15+

> +    rm -f ${D}${libdir}/libwayland-egl.so*

> +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc


Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting
many do_prepare_recipe_sysroot failures because both mesa and wayland
provide this file.

>  }

>  

>  # For the packages that make up the OpenGL interfaces, inject variables so that

> @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

>  FILES_libgl-mesa = "${libdir}/libGL.so.*"

>  FILES_libglapi = "${libdir}/libglapi.so.*"

>  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

> -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

>  FILES_libxatracker = "${libdir}/libxatracker.so.*"

>  

>  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

> @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p

>  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"

>  FILES_libgles3-mesa-dev = "${includedir}/GLES3"

>  FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"

> -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"

>  FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \

>                            ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \

>                            ${libdir}/pkgconfig/xatracker.pc"

> diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> similarity index 92%

> rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

> rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

> index 1a9ff98..788105b 100644

> --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

>  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \

>  	   file://fixpathinpcfiles.patch \

>             "

> -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

> -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"

> +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

> +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"

>  

>  inherit autotools pkgconfig

>  

> -- 

> 2.7.4

> 

> -- 

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Denys Dmytriyenko May 8, 2018, 9:28 p.m. | #2
On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:
> On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:

> > From: Denys Dmytriyenko <denys@ti.com>

> > 

> > Official announcement:

> > https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html

> > 

> > | libwayland-egl is now part of libwayland, and will presumably be removed

> > | from mesa in the not too distant future.

> > 

> > Update mesa recipe by removing corresponding libwayland-egl entries.

> > 

> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > ---

> >  meta/recipes-graphics/mesa/mesa.inc                                | 7 ++++---

> >  .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}               | 4 ++--

> >  2 files changed, 6 insertions(+), 5 deletions(-)

> >  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb} (92%)

> > 

> > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc

> > index b501b7e..c3a8e76 100644

> > --- a/meta/recipes-graphics/mesa/mesa.inc

> > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

> >               libgles1-mesa libgles1-mesa-dev \

> >               libgles2-mesa libgles2-mesa-dev \

> >               libgles3-mesa libgles3-mesa-dev \

> > -             libwayland-egl libwayland-egl-dev \

> >               libxatracker libxatracker-dev \

> >               mesa-megadriver mesa-vulkan-drivers \

> >              "

> > @@ -134,6 +133,10 @@ do_install_append () {

> >      # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 

> >      rm -f ${D}${sysconfdir}/drirc

> >      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

> > +

> > +    # libwayland-egl has been moved to wayland 1.15+

> > +    rm -f ${D}${libdir}/libwayland-egl.so*

> > +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

> 

> Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting

> many do_prepare_recipe_sysroot failures because both mesa and wayland

> provide this file.


Don't we remove .la files in bulk? I didn't see this problem when I was 
testing it. Plus it went through Ross' mut branch, then master-next and 
presumably few autobuilder iterations?

I can make the change to also remove .la, if it's really required.


> >  }

> >  

> >  # For the packages that make up the OpenGL interfaces, inject variables so that

> > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

> >  FILES_libgl-mesa = "${libdir}/libGL.so.*"

> >  FILES_libglapi = "${libdir}/libglapi.so.*"

> >  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

> > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

> >  FILES_libxatracker = "${libdir}/libxatracker.so.*"

> >  

> >  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

> > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p

> >  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"

> >  FILES_libgles3-mesa-dev = "${includedir}/GLES3"

> >  FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"

> > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"

> >  FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \

> >                            ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \

> >                            ${libdir}/pkgconfig/xatracker.pc"

> > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > similarity index 92%

> > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > index 1a9ff98..788105b 100644

> > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

> >  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \

> >  	   file://fixpathinpcfiles.patch \

> >             "

> > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

> > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"

> > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

> > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"

> >  

> >  inherit autotools pkgconfig

> >  

> > -- 

> > 2.7.4

> > 

> > -- 

> > _______________________________________________

> > Openembedded-core mailing list

> > Openembedded-core@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

> 

> -- 

> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com



-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Martin Jansa May 8, 2018, 9:33 p.m. | #3
It's possible to remove them globally with:
meta/classes/remove-libtool.bbclass
but mesa.inc already removes some of the .la files selectively, so it would
be nice to keep it working even for DISTROs which don't inherit
remove-libtool bbclass (for whatever reason).

On Tue, May 8, 2018 at 11:28 PM, Denys Dmytriyenko <denis@denix.org> wrote:

> On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:

> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:

> > > From: Denys Dmytriyenko <denys@ti.com>

> > >

> > > Official announcement:

> > > https://lists.freedesktop.org/archives/wayland-devel/2018-

> April/037767.html

> > >

> > > | libwayland-egl is now part of libwayland, and will presumably be

> removed

> > > | from mesa in the not too distant future.

> > >

> > > Update mesa recipe by removing corresponding libwayland-egl entries.

> > >

> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > > ---

> > >  meta/recipes-graphics/mesa/mesa.inc                                |

> 7 ++++---

> > >  .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}               |

> 4 ++--

> > >  2 files changed, 6 insertions(+), 5 deletions(-)

> > >  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>

> wayland_1.15.0.bb} (92%)

> > >

> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc

> b/meta/recipes-graphics/mesa/mesa.inc

> > > index b501b7e..c3a8e76 100644

> > > --- a/meta/recipes-graphics/mesa/mesa.inc

> > > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

> > >               libgles1-mesa libgles1-mesa-dev \

> > >               libgles2-mesa libgles2-mesa-dev \

> > >               libgles3-mesa libgles3-mesa-dev \

> > > -             libwayland-egl libwayland-egl-dev \

> > >               libxatracker libxatracker-dev \

> > >               mesa-megadriver mesa-vulkan-drivers \

> > >              "

> > > @@ -134,6 +133,10 @@ do_install_append () {

> > >      # it was packaged in libdricore9.1.3-1 and preventing upgrades

> when debian.bbclass was used

> > >      rm -f ${D}${sysconfdir}/drirc

> > >      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

> > > +

> > > +    # libwayland-egl has been moved to wayland 1.15+

> > > +    rm -f ${D}${libdir}/libwayland-egl.so*

> > > +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

> >

> > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting

> > many do_prepare_recipe_sysroot failures because both mesa and wayland

> > provide this file.

>

> Don't we remove .la files in bulk? I didn't see this problem when I was

> testing it. Plus it went through Ross' mut branch, then master-next and

> presumably few autobuilder iterations?

>

> I can make the change to also remove .la, if it's really required.

>

>

> > >  }

> > >

> > >  # For the packages that make up the OpenGL interfaces, inject

> variables so that

> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

> > >  FILES_libgl-mesa = "${libdir}/libGL.so.*"

> > >  FILES_libglapi = "${libdir}/libglapi.so.*"

> > >  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

> > >  FILES_libxatracker = "${libdir}/libxatracker.so.*"

> > >

> > >  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*

> ${includedir}/GLES ${libdir}/p

> > >  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2

> ${libdir}/pkgconfig/glesv2.pc"

> > >  FILES_libgles3-mesa-dev = "${includedir}/GLES3"

> > >  FILES_libosmesa-dev = "${libdir}/libOSMesa.*

> ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"

> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc

> ${libdir}/libwayland-egl.*"

> > >  FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/

> libxatracker.la \

> > >                            ${includedir}/xa_tracker.h

> ${includedir}/xa_composite.h ${includedir}/xa_context.h \

> > >                            ${libdir}/pkgconfig/xatracker.pc"

> > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > similarity index 92%

> > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > index 1a9ff98..788105b 100644

> > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

> > >  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.

> xz \

> > >        file://fixpathinpcfiles.patch \

> > >             "

> > > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

> > > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aab

> fc1ec9a13c86c98bbe2b812f008da27ab8"

> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db8

> 00f587329067962dbf65e14488b4b7aeb0"

> > >

> > >  inherit autotools pkgconfig

> > >

> > > --

> > > 2.7.4

> > >

> > > --

> > > _______________________________________________

> > > Openembedded-core mailing list

> > > Openembedded-core@lists.openembedded.org

> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

> >

> > --

> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

>

>

>
<div dir="ltr"><div>It&#39;s possible to remove them globally with:</div>meta/classes/remove-libtool.bbclass<br><div>but mesa.inc already removes some of the .la files selectively, so it would be nice to keep it working even for DISTROs which don&#39;t inherit remove-libtool bbclass (for whatever reason).</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 8, 2018 at 11:28 PM, Denys Dmytriyenko <span dir="ltr">&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:<br>
&gt; On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:<br>
&gt; &gt; From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; <br>
&gt; &gt; Official announcement:<br>
&gt; &gt; <a href="https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>archives/wayland-devel/2018-<wbr>April/037767.html</a><br>
&gt; &gt; <br>
&gt; &gt; | libwayland-egl is now part of libwayland, and will presumably be removed<br>
&gt; &gt; | from mesa in the not too distant future.<br>
&gt; &gt; <br>
&gt; &gt; Update mesa recipe by removing corresponding libwayland-egl entries.<br>
&gt; &gt; <br>
&gt; &gt; Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; ---<br>
&gt; &gt;  meta/recipes-graphics/mesa/<wbr>mesa.inc                                | 7 ++++---<br>
&gt; &gt;  .../wayland/{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> =&gt; <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>}               | 4 ++--<br>
&gt; &gt;  2 files changed, 6 insertions(+), 5 deletions(-)<br>
&gt; &gt;  rename meta/recipes-graphics/wayland/<wbr>{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> =&gt; <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} (92%)<br>
&gt; &gt; <br>
&gt; &gt; diff --git a/meta/recipes-graphics/mesa/<wbr>mesa.inc b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br>
&gt; &gt; index b501b7e..c3a8e76 100644<br>
&gt; &gt; --- a/meta/recipes-graphics/mesa/<wbr>mesa.inc<br>
&gt; &gt; +++ b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br>
&gt; &gt; @@ -119,7 +119,6 @@ PACKAGES =+ &quot;libegl-mesa libegl-mesa-dev \<br>
&gt; &gt;               libgles1-mesa libgles1-mesa-dev \<br>
&gt; &gt;               libgles2-mesa libgles2-mesa-dev \<br>
&gt; &gt;               libgles3-mesa libgles3-mesa-dev \<br>
&gt; &gt; -             libwayland-egl libwayland-egl-dev \<br>
&gt; &gt;               libxatracker libxatracker-dev \<br>
&gt; &gt;               mesa-megadriver mesa-vulkan-drivers \<br>
&gt; &gt;              &quot;<br>
&gt; &gt; @@ -134,6 +133,10 @@ do_install_append () {<br>
&gt; &gt;      # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used <br>
&gt; &gt;      rm -f ${D}${sysconfdir}/drirc<br>
&gt; &gt;      chrpath --delete ${D}${libdir}/dri/*_dri.so || true<br>
&gt; &gt; +<br>
&gt; &gt; +    # libwayland-egl has been moved to wayland 1.15+<br>
&gt; &gt; +    rm -f ${D}${libdir}/libwayland-egl.<wbr>so*<br>
&gt; &gt; +    rm -f ${D}${libdir}/pkgconfig/<wbr>wayland-egl.pc<br>
&gt; <br>
&gt; Shouldn&#39;t /usr/lib/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> be removed as well? Now I&#39;m getting<br>
&gt; many do_prepare_recipe_sysroot failures because both mesa and wayland<br>
&gt; provide this file.<br>
<br>
</div></div>Don&#39;t we remove .la files in bulk? I didn&#39;t see this problem when I was <br>
testing it. Plus it went through Ross&#39; mut branch, then master-next and <br>
presumably few autobuilder iterations?<br>
<br>
I can make the change to also remove .la, if it&#39;s really required.<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
&gt; &gt;  }<br>
&gt; &gt;  <br>
&gt; &gt;  # For the packages that make up the OpenGL interfaces, inject variables so that<br>
&gt; &gt; @@ -204,7 +207,6 @@ FILES_libgles2-mesa = &quot;${libdir}/libGLESv2.so.*&quot;<br>
&gt; &gt;  FILES_libgl-mesa = &quot;${libdir}/libGL.so.*&quot;<br>
&gt; &gt;  FILES_libglapi = &quot;${libdir}/libglapi.so.*&quot;<br>
&gt; &gt;  FILES_libosmesa = &quot;${libdir}/libOSMesa.so.*&quot;<br>
&gt; &gt; -FILES_libwayland-egl = &quot;${libdir}/libwayland-egl.so.*<wbr>&quot;<br>
&gt; &gt;  FILES_libxatracker = &quot;${libdir}/libxatracker.so.*&quot;<br>
&gt; &gt;  <br>
&gt; &gt;  FILES_${PN}-dev = &quot;${libdir}/pkgconfig/dri.pc ${includedir}/vulkan&quot;<br>
&gt; &gt; @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = &quot;${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p<br>
&gt; &gt;  FILES_libgles2-mesa-dev = &quot;${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc&quot;<br>
&gt; &gt;  FILES_libgles3-mesa-dev = &quot;${includedir}/GLES3&quot;<br>
&gt; &gt;  FILES_libosmesa-dev = &quot;${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc&quot;<br>
&gt; &gt; -FILES_libwayland-egl-dev = &quot;${libdir}/pkgconfig/wayland-<wbr>egl.pc ${libdir}/libwayland-egl.*&quot;<br>
&gt; &gt;  FILES_libxatracker-dev = &quot;${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la" rel="noreferrer" target="_blank">libxatracker.la</a> \<br>
&gt; &gt;                            ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \<br>
&gt; &gt;                            ${libdir}/pkgconfig/xatracker.<wbr>pc&quot;<br>
&gt; &gt; diff --git a/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> b/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a><br>
&gt; &gt; similarity index 92%<br>
&gt; &gt; rename from meta/recipes-graphics/wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank"><wbr>wayland_1.14.0.bb</a><br>
&gt; &gt; rename to meta/recipes-graphics/wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank"><wbr>wayland_1.15.0.bb</a><br>
&gt; &gt; index 1a9ff98..788105b 100644<br>
&gt; &gt; --- a/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a><br>
&gt; &gt; +++ b/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a><br>
&gt; &gt; @@ -15,8 +15,8 @@ DEPENDS = &quot;expat libxml2 libffi wayland-native&quot;<br>
&gt; &gt;  SRC_URI = &quot;<a href="https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" rel="noreferrer" target="_blank">https://wayland.freedesktop.<wbr>org/releases/${BPN}-${PV}.tar.<wbr>xz</a> \<br>
&gt; &gt;        file://fixpathinpcfiles.patch \<br>
&gt; &gt;             &quot;<br>
&gt; &gt; -SRC_URI[md5sum] = &quot;<wbr>0235f6075c32c3be61cff94fa0b9f1<wbr>08&quot;<br>
&gt; &gt; -SRC_URI[sha256sum] = &quot;<wbr>ed80cabc0961a759a42092e2c39aab<wbr>fc1ec9a13c86c98bbe2b812f008da2<wbr>7ab8&quot;<br>
&gt; &gt; +SRC_URI[md5sum] = &quot;<wbr>b7393c17fdce9a8d383edab656c92f<wbr>d2&quot;<br>
&gt; &gt; +SRC_URI[sha256sum] = &quot;<wbr>eb3fbebb8559d56a80ad3753ec3db8<wbr>00f587329067962dbf65e14488b4b7<wbr>aeb0&quot;<br>
&gt; &gt;  <br>
&gt; &gt;  inherit autotools pkgconfig<br>
&gt; &gt;  <br>
&gt; &gt; -- <br>
&gt; &gt; 2.7.4<br>
&gt; &gt; <br>
&gt; &gt; -- <br>
&gt; &gt; ______________________________<wbr>_________________<br>
&gt; &gt; Openembedded-core mailing list<br>
&gt; &gt; <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
&gt; &gt; <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
&gt; <br>
&gt; -- <br>
&gt; Martin &#39;JaMa&#39; Jansa     jabber: <a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a><br>
<br>
<br>
</div></div></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross May 8, 2018, 9:59 p.m. | #4
Yeah the problem here is that poky uses remove-libtool, and the nodistro
builds apparently don't build anything Wayland.

I'll check the AB configure and ensure more coverage for the nodistro
buildset.

Ross

On 8 May 2018 at 22:28, Denys Dmytriyenko <denis@denix.org> wrote:

> On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:

> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:

> > > From: Denys Dmytriyenko <denys@ti.com>

> > >

> > > Official announcement:

> > > https://lists.freedesktop.org/archives/wayland-devel/2018-

> April/037767.html

> > >

> > > | libwayland-egl is now part of libwayland, and will presumably be

> removed

> > > | from mesa in the not too distant future.

> > >

> > > Update mesa recipe by removing corresponding libwayland-egl entries.

> > >

> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > > ---

> > >  meta/recipes-graphics/mesa/mesa.inc                                |

> 7 ++++---

> > >  .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}               |

> 4 ++--

> > >  2 files changed, 6 insertions(+), 5 deletions(-)

> > >  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>

> wayland_1.15.0.bb} (92%)

> > >

> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc

> b/meta/recipes-graphics/mesa/mesa.inc

> > > index b501b7e..c3a8e76 100644

> > > --- a/meta/recipes-graphics/mesa/mesa.inc

> > > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

> > >               libgles1-mesa libgles1-mesa-dev \

> > >               libgles2-mesa libgles2-mesa-dev \

> > >               libgles3-mesa libgles3-mesa-dev \

> > > -             libwayland-egl libwayland-egl-dev \

> > >               libxatracker libxatracker-dev \

> > >               mesa-megadriver mesa-vulkan-drivers \

> > >              "

> > > @@ -134,6 +133,10 @@ do_install_append () {

> > >      # it was packaged in libdricore9.1.3-1 and preventing upgrades

> when debian.bbclass was used

> > >      rm -f ${D}${sysconfdir}/drirc

> > >      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

> > > +

> > > +    # libwayland-egl has been moved to wayland 1.15+

> > > +    rm -f ${D}${libdir}/libwayland-egl.so*

> > > +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

> >

> > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting

> > many do_prepare_recipe_sysroot failures because both mesa and wayland

> > provide this file.

>

> Don't we remove .la files in bulk? I didn't see this problem when I was

> testing it. Plus it went through Ross' mut branch, then master-next and

> presumably few autobuilder iterations?

>

> I can make the change to also remove .la, if it's really required.

>

>

> > >  }

> > >

> > >  # For the packages that make up the OpenGL interfaces, inject

> variables so that

> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

> > >  FILES_libgl-mesa = "${libdir}/libGL.so.*"

> > >  FILES_libglapi = "${libdir}/libglapi.so.*"

> > >  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

> > >  FILES_libxatracker = "${libdir}/libxatracker.so.*"

> > >

> > >  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*

> ${includedir}/GLES ${libdir}/p

> > >  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2

> ${libdir}/pkgconfig/glesv2.pc"

> > >  FILES_libgles3-mesa-dev = "${includedir}/GLES3"

> > >  FILES_libosmesa-dev = "${libdir}/libOSMesa.*

> ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"

> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc

> ${libdir}/libwayland-egl.*"

> > >  FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/

> libxatracker.la \

> > >                            ${includedir}/xa_tracker.h

> ${includedir}/xa_composite.h ${includedir}/xa_context.h \

> > >                            ${libdir}/pkgconfig/xatracker.pc"

> > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > similarity index 92%

> > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > index 1a9ff98..788105b 100644

> > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

> > >  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.

> xz \

> > >        file://fixpathinpcfiles.patch \

> > >             "

> > > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

> > > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aab

> fc1ec9a13c86c98bbe2b812f008da27ab8"

> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db8

> 00f587329067962dbf65e14488b4b7aeb0"

> > >

> > >  inherit autotools pkgconfig

> > >

> > > --

> > > 2.7.4

> > >

> > > --

> > > _______________________________________________

> > > Openembedded-core mailing list

> > > Openembedded-core@lists.openembedded.org

> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

> >

> > --

> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

>

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>
<div dir="ltr">Yeah the problem here is that poky uses remove-libtool, and the nodistro builds apparently don&#39;t build anything Wayland.<div><br></div><div>I&#39;ll check the AB configure and ensure more coverage for the nodistro buildset.</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 8 May 2018 at 22:28, Denys Dmytriyenko <span dir="ltr">&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:<br>
&gt; On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:<br>
&gt; &gt; From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; <br>
&gt; &gt; Official announcement:<br>
&gt; &gt; <a href="https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>archives/wayland-devel/2018-<wbr>April/037767.html</a><br>
&gt; &gt; <br>
&gt; &gt; | libwayland-egl is now part of libwayland, and will presumably be removed<br>
&gt; &gt; | from mesa in the not too distant future.<br>
&gt; &gt; <br>
&gt; &gt; Update mesa recipe by removing corresponding libwayland-egl entries.<br>
&gt; &gt; <br>
&gt; &gt; Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; ---<br>
&gt; &gt;  meta/recipes-graphics/mesa/<wbr>mesa.inc                                | 7 ++++---<br>
&gt; &gt;  .../wayland/{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> =&gt; <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>}               | 4 ++--<br>
&gt; &gt;  2 files changed, 6 insertions(+), 5 deletions(-)<br>
&gt; &gt;  rename meta/recipes-graphics/wayland/<wbr>{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> =&gt; <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} (92%)<br>
&gt; &gt; <br>
&gt; &gt; diff --git a/meta/recipes-graphics/mesa/<wbr>mesa.inc b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br>
&gt; &gt; index b501b7e..c3a8e76 100644<br>
&gt; &gt; --- a/meta/recipes-graphics/mesa/<wbr>mesa.inc<br>
&gt; &gt; +++ b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br>
&gt; &gt; @@ -119,7 +119,6 @@ PACKAGES =+ &quot;libegl-mesa libegl-mesa-dev \<br>
&gt; &gt;               libgles1-mesa libgles1-mesa-dev \<br>
&gt; &gt;               libgles2-mesa libgles2-mesa-dev \<br>
&gt; &gt;               libgles3-mesa libgles3-mesa-dev \<br>
&gt; &gt; -             libwayland-egl libwayland-egl-dev \<br>
&gt; &gt;               libxatracker libxatracker-dev \<br>
&gt; &gt;               mesa-megadriver mesa-vulkan-drivers \<br>
&gt; &gt;              &quot;<br>
&gt; &gt; @@ -134,6 +133,10 @@ do_install_append () {<br>
&gt; &gt;      # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used <br>
&gt; &gt;      rm -f ${D}${sysconfdir}/drirc<br>
&gt; &gt;      chrpath --delete ${D}${libdir}/dri/*_dri.so || true<br>
&gt; &gt; +<br>
&gt; &gt; +    # libwayland-egl has been moved to wayland 1.15+<br>
&gt; &gt; +    rm -f ${D}${libdir}/libwayland-egl.<wbr>so*<br>
&gt; &gt; +    rm -f ${D}${libdir}/pkgconfig/<wbr>wayland-egl.pc<br>
&gt; <br>
&gt; Shouldn&#39;t /usr/lib/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> be removed as well? Now I&#39;m getting<br>
&gt; many do_prepare_recipe_sysroot failures because both mesa and wayland<br>
&gt; provide this file.<br>
<br>
</div></div>Don&#39;t we remove .la files in bulk? I didn&#39;t see this problem when I was <br>
testing it. Plus it went through Ross&#39; mut branch, then master-next and <br>
presumably few autobuilder iterations?<br>
<br>
I can make the change to also remove .la, if it&#39;s really required.<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
&gt; &gt;  }<br>
&gt; &gt;  <br>
&gt; &gt;  # For the packages that make up the OpenGL interfaces, inject variables so that<br>
&gt; &gt; @@ -204,7 +207,6 @@ FILES_libgles2-mesa = &quot;${libdir}/libGLESv2.so.*&quot;<br>
&gt; &gt;  FILES_libgl-mesa = &quot;${libdir}/libGL.so.*&quot;<br>
&gt; &gt;  FILES_libglapi = &quot;${libdir}/libglapi.so.*&quot;<br>
&gt; &gt;  FILES_libosmesa = &quot;${libdir}/libOSMesa.so.*&quot;<br>
&gt; &gt; -FILES_libwayland-egl = &quot;${libdir}/libwayland-egl.so.*<wbr>&quot;<br>
&gt; &gt;  FILES_libxatracker = &quot;${libdir}/libxatracker.so.*&quot;<br>
&gt; &gt;  <br>
&gt; &gt;  FILES_${PN}-dev = &quot;${libdir}/pkgconfig/dri.pc ${includedir}/vulkan&quot;<br>
&gt; &gt; @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = &quot;${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p<br>
&gt; &gt;  FILES_libgles2-mesa-dev = &quot;${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc&quot;<br>
&gt; &gt;  FILES_libgles3-mesa-dev = &quot;${includedir}/GLES3&quot;<br>
&gt; &gt;  FILES_libosmesa-dev = &quot;${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc&quot;<br>
&gt; &gt; -FILES_libwayland-egl-dev = &quot;${libdir}/pkgconfig/wayland-<wbr>egl.pc ${libdir}/libwayland-egl.*&quot;<br>
&gt; &gt;  FILES_libxatracker-dev = &quot;${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la" rel="noreferrer" target="_blank">libxatracker.la</a> \<br>
&gt; &gt;                            ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \<br>
&gt; &gt;                            ${libdir}/pkgconfig/xatracker.<wbr>pc&quot;<br>
&gt; &gt; diff --git a/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> b/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a><br>
&gt; &gt; similarity index 92%<br>
&gt; &gt; rename from meta/recipes-graphics/wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank"><wbr>wayland_1.14.0.bb</a><br>
&gt; &gt; rename to meta/recipes-graphics/wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank"><wbr>wayland_1.15.0.bb</a><br>
&gt; &gt; index 1a9ff98..788105b 100644<br>
&gt; &gt; --- a/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a><br>
&gt; &gt; +++ b/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a><br>
&gt; &gt; @@ -15,8 +15,8 @@ DEPENDS = &quot;expat libxml2 libffi wayland-native&quot;<br>
&gt; &gt;  SRC_URI = &quot;<a href="https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" rel="noreferrer" target="_blank">https://wayland.freedesktop.<wbr>org/releases/${BPN}-${PV}.tar.<wbr>xz</a> \<br>
&gt; &gt;        file://fixpathinpcfiles.patch \<br>
&gt; &gt;             &quot;<br>
&gt; &gt; -SRC_URI[md5sum] = &quot;<wbr>0235f6075c32c3be61cff94fa0b9f1<wbr>08&quot;<br>
&gt; &gt; -SRC_URI[sha256sum] = &quot;<wbr>ed80cabc0961a759a42092e2c39aab<wbr>fc1ec9a13c86c98bbe2b812f008da2<wbr>7ab8&quot;<br>
&gt; &gt; +SRC_URI[md5sum] = &quot;<wbr>b7393c17fdce9a8d383edab656c92f<wbr>d2&quot;<br>
&gt; &gt; +SRC_URI[sha256sum] = &quot;<wbr>eb3fbebb8559d56a80ad3753ec3db8<wbr>00f587329067962dbf65e14488b4b7<wbr>aeb0&quot;<br>
&gt; &gt;  <br>
&gt; &gt;  inherit autotools pkgconfig<br>
&gt; &gt;  <br>
&gt; &gt; -- <br>
&gt; &gt; 2.7.4<br>
&gt; &gt; <br>
&gt; &gt; -- <br>
&gt; &gt; ______________________________<wbr>_________________<br>
&gt; &gt; Openembedded-core mailing list<br>
&gt; &gt; <a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
&gt; &gt; <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
&gt; <br>
&gt; -- <br>
&gt; Martin &#39;JaMa&#39; Jansa     jabber: <a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a><br>
<br>
<br>
-- <br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</div></div></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Martin Jansa May 8, 2018, 10:12 p.m. | #5
Ross: nodistro includes remove-libtool as well

I've noticed the issue in DISTRO which doesn't use INHERIT_DISTRO from
defaultsetup.inc.

On Tue, May 8, 2018 at 11:59 PM, Burton, Ross <ross.burton@intel.com> wrote:

> Yeah the problem here is that poky uses remove-libtool, and the nodistro

> builds apparently don't build anything Wayland.

>

> I'll check the AB configure and ensure more coverage for the nodistro

> buildset.

>

> Ross

>

> On 8 May 2018 at 22:28, Denys Dmytriyenko <denis@denix.org> wrote:

>

>> On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:

>> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:

>> > > From: Denys Dmytriyenko <denys@ti.com>

>> > >

>> > > Official announcement:

>> > > https://lists.freedesktop.org/archives/wayland-devel/2018-Ap

>> ril/037767.html

>> > >

>> > > | libwayland-egl is now part of libwayland, and will presumably be

>> removed

>> > > | from mesa in the not too distant future.

>> > >

>> > > Update mesa recipe by removing corresponding libwayland-egl entries.

>> > >

>> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

>> > > ---

>> > >  meta/recipes-graphics/mesa/mesa.inc

>> | 7 ++++---

>> > >  .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}

>>  | 4 ++--

>> > >  2 files changed, 6 insertions(+), 5 deletions(-)

>> > >  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>

>> wayland_1.15.0.bb} (92%)

>> > >

>> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc

>> b/meta/recipes-graphics/mesa/mesa.inc

>> > > index b501b7e..c3a8e76 100644

>> > > --- a/meta/recipes-graphics/mesa/mesa.inc

>> > > +++ b/meta/recipes-graphics/mesa/mesa.inc

>> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

>> > >               libgles1-mesa libgles1-mesa-dev \

>> > >               libgles2-mesa libgles2-mesa-dev \

>> > >               libgles3-mesa libgles3-mesa-dev \

>> > > -             libwayland-egl libwayland-egl-dev \

>> > >               libxatracker libxatracker-dev \

>> > >               mesa-megadriver mesa-vulkan-drivers \

>> > >              "

>> > > @@ -134,6 +133,10 @@ do_install_append () {

>> > >      # it was packaged in libdricore9.1.3-1 and preventing upgrades

>> when debian.bbclass was used

>> > >      rm -f ${D}${sysconfdir}/drirc

>> > >      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

>> > > +

>> > > +    # libwayland-egl has been moved to wayland 1.15+

>> > > +    rm -f ${D}${libdir}/libwayland-egl.so*

>> > > +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

>> >

>> > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm

>> getting

>> > many do_prepare_recipe_sysroot failures because both mesa and wayland

>> > provide this file.

>>

>> Don't we remove .la files in bulk? I didn't see this problem when I was

>> testing it. Plus it went through Ross' mut branch, then master-next and

>> presumably few autobuilder iterations?

>>

>> I can make the change to also remove .la, if it's really required.

>>

>>

>> > >  }

>> > >

>> > >  # For the packages that make up the OpenGL interfaces, inject

>> variables so that

>> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

>> > >  FILES_libgl-mesa = "${libdir}/libGL.so.*"

>> > >  FILES_libglapi = "${libdir}/libglapi.so.*"

>> > >  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

>> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

>> > >  FILES_libxatracker = "${libdir}/libxatracker.so.*"

>> > >

>> > >  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

>> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*

>> ${includedir}/GLES ${libdir}/p

>> > >  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2

>> ${libdir}/pkgconfig/glesv2.pc"

>> > >  FILES_libgles3-mesa-dev = "${includedir}/GLES3"

>> > >  FILES_libosmesa-dev = "${libdir}/libOSMesa.*

>> ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"

>> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc

>> ${libdir}/libwayland-egl.*"

>> > >  FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/

>> libxatracker.la \

>> > >                            ${includedir}/xa_tracker.h

>> ${includedir}/xa_composite.h ${includedir}/xa_context.h \

>> > >                            ${libdir}/pkgconfig/xatracker.pc"

>> > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

>> b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

>> > > similarity index 92%

>> > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

>> > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

>> > > index 1a9ff98..788105b 100644

>> > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

>> > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

>> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

>> > >  SRC_URI = "https://wayland.freedesktop.o

>> rg/releases/${BPN}-${PV}.tar.xz \

>> > >        file://fixpathinpcfiles.patch \

>> > >             "

>> > > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

>> > > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aa

>> bfc1ec9a13c86c98bbe2b812f008da27ab8"

>> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

>> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db

>> 800f587329067962dbf65e14488b4b7aeb0"

>> > >

>> > >  inherit autotools pkgconfig

>> > >

>> > > --

>> > > 2.7.4

>> > >

>> > > --

>> > > _______________________________________________

>> > > Openembedded-core mailing list

>> > > Openembedded-core@lists.openembedded.org

>> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

>> >

>> > --

>> > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

>>

>>

>> --

>> _______________________________________________

>> Openembedded-core mailing list

>> Openembedded-core@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>>

>

>
<div dir="ltr">Ross: nodistro includes remove-libtool as well<div><br></div><div>I&#39;ve noticed the issue in DISTRO which doesn&#39;t use INHERIT_DISTRO from defaultsetup.inc.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 8, 2018 at 11:59 PM, Burton, Ross <span dir="ltr">&lt;<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Yeah the problem here is that poky uses remove-libtool, and the nodistro builds apparently don&#39;t build anything Wayland.<div><br></div><div>I&#39;ll check the AB configure and ensure more coverage for the nodistro buildset.</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>Ross</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On 8 May 2018 at 22:28, Denys Dmytriyenko <span dir="ltr">&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="m_-7731596195213158602HOEnZb"><div class="m_-7731596195213158602h5">On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:<br>
&gt; On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:<br>
&gt; &gt; From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>&gt;<br>
&gt; &gt; <br>
&gt; &gt; Official announcement:<br>
&gt; &gt; <a href="https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>archives/wayland-devel/2018-Ap<wbr>ril/037767.html</a><br>
&gt; &gt; <br>
&gt; &gt; | libwayland-egl is now part of libwayland, and will presumably be removed<br>
&gt; &gt; | from mesa in the not too distant future.<br>
&gt; &gt; <br>
&gt; &gt; Update mesa recipe by removing corresponding libwayland-egl entries.<br>
&gt; &gt; <br>
&gt; &gt; Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>&gt;<br>
&gt; &gt; ---<br>
&gt; &gt;  meta/recipes-graphics/mesa/mes<wbr>a.inc                                | 7 ++++---<br>
&gt; &gt;  .../wayland/{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> =&gt; <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>}               | 4 ++--<br>
&gt; &gt;  2 files changed, 6 insertions(+), 5 deletions(-)<br>
&gt; &gt;  rename meta/recipes-graphics/wayland/<wbr>{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> =&gt; <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} (92%)<br>
&gt; &gt; <br>
&gt; &gt; diff --git a/meta/recipes-graphics/mesa/m<wbr>esa.inc b/meta/recipes-graphics/mesa/m<wbr>esa.inc<br>
&gt; &gt; index b501b7e..c3a8e76 100644<br>
&gt; &gt; --- a/meta/recipes-graphics/mesa/m<wbr>esa.inc<br>
&gt; &gt; +++ b/meta/recipes-graphics/mesa/m<wbr>esa.inc<br>
&gt; &gt; @@ -119,7 +119,6 @@ PACKAGES =+ &quot;libegl-mesa libegl-mesa-dev \<br>
&gt; &gt;               libgles1-mesa libgles1-mesa-dev \<br>
&gt; &gt;               libgles2-mesa libgles2-mesa-dev \<br>
&gt; &gt;               libgles3-mesa libgles3-mesa-dev \<br>
&gt; &gt; -             libwayland-egl libwayland-egl-dev \<br>
&gt; &gt;               libxatracker libxatracker-dev \<br>
&gt; &gt;               mesa-megadriver mesa-vulkan-drivers \<br>
&gt; &gt;              &quot;<br>
&gt; &gt; @@ -134,6 +133,10 @@ do_install_append () {<br>
&gt; &gt;      # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used <br>
&gt; &gt;      rm -f ${D}${sysconfdir}/drirc<br>
&gt; &gt;      chrpath --delete ${D}${libdir}/dri/*_dri.so || true<br>
&gt; &gt; +<br>
&gt; &gt; +    # libwayland-egl has been moved to wayland 1.15+<br>
&gt; &gt; +    rm -f ${D}${libdir}/libwayland-egl.s<wbr>o*<br>
&gt; &gt; +    rm -f ${D}${libdir}/pkgconfig/waylan<wbr>d-egl.pc<br>
&gt; <br>
&gt; Shouldn&#39;t /usr/lib/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> be removed as well? Now I&#39;m getting<br>
&gt; many do_prepare_recipe_sysroot failures because both mesa and wayland<br>
&gt; provide this file.<br>
<br>
</div></div>Don&#39;t we remove .la files in bulk? I didn&#39;t see this problem when I was <br>
testing it. Plus it went through Ross&#39; mut branch, then master-next and <br>
presumably few autobuilder iterations?<br>
<br>
I can make the change to also remove .la, if it&#39;s really required.<br>
<div class="m_-7731596195213158602HOEnZb"><div class="m_-7731596195213158602h5"><br>
<br>
&gt; &gt;  }<br>
&gt; &gt;  <br>
&gt; &gt;  # For the packages that make up the OpenGL interfaces, inject variables so that<br>
&gt; &gt; @@ -204,7 +207,6 @@ FILES_libgles2-mesa = &quot;${libdir}/libGLESv2.so.*&quot;<br>
&gt; &gt;  FILES_libgl-mesa = &quot;${libdir}/libGL.so.*&quot;<br>
&gt; &gt;  FILES_libglapi = &quot;${libdir}/libglapi.so.*&quot;<br>
&gt; &gt;  FILES_libosmesa = &quot;${libdir}/libOSMesa.so.*&quot;<br>
&gt; &gt; -FILES_libwayland-egl = &quot;${libdir}/libwayland-egl.so.*<wbr>&quot;<br>
&gt; &gt;  FILES_libxatracker = &quot;${libdir}/libxatracker.so.*&quot;<br>
&gt; &gt;  <br>
&gt; &gt;  FILES_${PN}-dev = &quot;${libdir}/pkgconfig/dri.pc ${includedir}/vulkan&quot;<br>
&gt; &gt; @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = &quot;${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p<br>
&gt; &gt;  FILES_libgles2-mesa-dev = &quot;${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc&quot;<br>
&gt; &gt;  FILES_libgles3-mesa-dev = &quot;${includedir}/GLES3&quot;<br>
&gt; &gt;  FILES_libosmesa-dev = &quot;${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc&quot;<br>
&gt; &gt; -FILES_libwayland-egl-dev = &quot;${libdir}/pkgconfig/wayland-e<wbr>gl.pc ${libdir}/libwayland-egl.*&quot;<br>
&gt; &gt;  FILES_libxatracker-dev = &quot;${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la" rel="noreferrer" target="_blank">libxatracker.la</a> \<br>
&gt; &gt;                            ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \<br>
&gt; &gt;                            ${libdir}/pkgconfig/xatracker.<wbr>pc&quot;<br>
&gt; &gt; diff --git a/meta/recipes-graphics/waylan<wbr>d/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> b/meta/recipes-graphics/waylan<wbr>d/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a><br>
&gt; &gt; similarity index 92%<br>
&gt; &gt; rename from meta/recipes-graphics/wayland/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank"><wbr>wayland_1.14.0.bb</a><br>
&gt; &gt; rename to meta/recipes-graphics/wayland/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank"><wbr>wayland_1.15.0.bb</a><br>
&gt; &gt; index 1a9ff98..788105b 100644<br>
&gt; &gt; --- a/meta/recipes-graphics/waylan<wbr>d/<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a><br>
&gt; &gt; +++ b/meta/recipes-graphics/waylan<wbr>d/<a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a><br>
&gt; &gt; @@ -15,8 +15,8 @@ DEPENDS = &quot;expat libxml2 libffi wayland-native&quot;<br>
&gt; &gt;  SRC_URI = &quot;<a href="https://wayland.freedesktop.org/releases/$%7BBPN%7D-$%7BPV%7D.tar.xz" rel="noreferrer" target="_blank">https://wayland.freedesktop.o<wbr>rg/releases/${BPN}-${PV}.tar.x<wbr>z</a> \<br>
&gt; &gt;        file://fixpathinpcfiles.patch \<br>
&gt; &gt;             &quot;<br>
&gt; &gt; -SRC_URI[md5sum] = &quot;0235f6075c32c3be61cff94fa0b9f<wbr>108&quot;<br>
&gt; &gt; -SRC_URI[sha256sum] = &quot;ed80cabc0961a759a42092e2c39aa<wbr>bfc1ec9a13c86c98bbe2b812f008da<wbr>27ab8&quot;<br>
&gt; &gt; +SRC_URI[md5sum] = &quot;b7393c17fdce9a8d383edab656c92<wbr>fd2&quot;<br>
&gt; &gt; +SRC_URI[sha256sum] = &quot;eb3fbebb8559d56a80ad3753ec3db<wbr>800f587329067962dbf65e14488b4b<wbr>7aeb0&quot;<br>
&gt; &gt;  <br>
&gt; &gt;  inherit autotools pkgconfig<br>
&gt; &gt;  <br>
&gt; &gt; -- <br>
&gt; &gt; 2.7.4<br>
&gt; &gt; <br>
&gt; &gt; -- <br>
&gt; &gt; ______________________________<wbr>_________________<br>
&gt; &gt; Openembedded-core mailing list<br>
&gt; &gt; <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openem<wbr>bedded.org</a><br>
&gt; &gt; <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
&gt; <br>
&gt; -- <br>
&gt; Martin &#39;JaMa&#39; Jansa     jabber: <a href="mailto:Martin.Jansa@gmail.com" target="_blank">Martin.Jansa@gmail.com</a><br>
<br>
<br>
-- <br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openem<wbr>bedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Mark Asselstine May 9, 2018, 4 p.m. | #6
On Tuesday, May 8, 2018 5:18:44 PM EDT Martin Jansa wrote:
> On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:

> > From: Denys Dmytriyenko <denys@ti.com>

> > 

> > Official announcement:

> > https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.htm

> > l

> > 

> > | libwayland-egl is now part of libwayland, and will presumably be removed

> > | from mesa in the not too distant future.

> > 

> > Update mesa recipe by removing corresponding libwayland-egl entries.

> > 

> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > ---

> > 

> >  meta/recipes-graphics/mesa/mesa.inc                                | 7

> >  ++++--- .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}            

> >    | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-)

> >  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>

> >  wayland_1.15.0.bb} (92%)> 

> > diff --git a/meta/recipes-graphics/mesa/mesa.inc

> > b/meta/recipes-graphics/mesa/mesa.inc index b501b7e..c3a8e76 100644

> > --- a/meta/recipes-graphics/mesa/mesa.inc

> > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

> > 

> >               libgles1-mesa libgles1-mesa-dev \

> >               libgles2-mesa libgles2-mesa-dev \

> >               libgles3-mesa libgles3-mesa-dev \

> > 

> > -             libwayland-egl libwayland-egl-dev \

> > 

> >               libxatracker libxatracker-dev \

> >               mesa-megadriver mesa-vulkan-drivers \

> >              

> >              "

> > 

> > @@ -134,6 +133,10 @@ do_install_append () {

> > 

> >      # it was packaged in libdricore9.1.3-1 and preventing upgrades when

> >      debian.bbclass was used rm -f ${D}${sysconfdir}/drirc

> >      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

> > 

> > +

> > +    # libwayland-egl has been moved to wayland 1.15+

> > +    rm -f ${D}${libdir}/libwayland-egl.so*

> > +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

> 

> Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting

> many do_prepare_recipe_sysroot failures because both mesa and wayland

> provide this file.


I am also seeing build failures due to this conflict:

ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/
libwayland-egl.la is installed by both wayland and mesa, aborting
..
ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were 
installed but not shipped in any package:
  /usr/lib64/libwayland-egl.la
Please set FILES such that these items are packaged. Alternatively if they are 
unneeded, avoid installing them or delete them within do_install.
mesa: 1 installed and not shipped files. [installed-vs-shipped]

is someone working on a fix or should I take some time to put something 
together?

Mark


> 

> >  }

> >  

> >  # For the packages that make up the OpenGL interfaces, inject variables

> >  so that> 

> > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

> > 

> >  FILES_libgl-mesa = "${libdir}/libGL.so.*"

> >  FILES_libglapi = "${libdir}/libglapi.so.*"

> >  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

> > 

> > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

> > 

> >  FILES_libxatracker = "${libdir}/libxatracker.so.*"

> >  

> >  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

> > 

> > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*

> > ${includedir}/GLES ${libdir}/p> 

> >  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2

> >  ${libdir}/pkgconfig/glesv2.pc" FILES_libgles3-mesa-dev =

> >  "${includedir}/GLES3"

> >  FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h

> >  ${libdir}/pkgconfig/osmesa.pc"> 

> > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc

> > ${libdir}/libwayland-egl.*"> 

> >  FILES_libxatracker-dev = "${libdir}/libxatracker.so

> >  ${libdir}/libxatracker.la \>  

> >                            ${includedir}/xa_tracker.h

> >                            ${includedir}/xa_composite.h

> >                            ${includedir}/xa_context.h \

> >                            ${libdir}/pkgconfig/xatracker.pc"

> > 

> > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > b/meta/recipes-graphics/wayland/wayland_1.15.0.bb similarity index 92%

> > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > index 1a9ff98..788105b 100644

> > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

> > 

> >  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \

> >  

> >  	   file://fixpathinpcfiles.patch \

> >  	   

> >             "

> > 

> > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

> > -SRC_URI[sha256sum] =

> > "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"

> > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

> > +SRC_URI[sha256sum] =

> > "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"> 

> >  inherit autotools pkgconfig





-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross May 9, 2018, 4:03 p.m. | #7
On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>
wrote:

> I am also seeing build failures due to this conflict:

>

> ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/

> libwayland-egl.la is installed by both wayland and mesa, aborting

> ..

> ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were

> installed but not shipped in any package:

>   /usr/lib64/libwayland-egl.la

> Please set FILES such that these items are packaged. Alternatively if they

> are

> unneeded, avoid installing them or delete them within do_install.

> mesa: 1 installed and not shipped files. [installed-vs-shipped]

>

> is someone working on a fix or should I take some time to put something

> together?

>


As it appears you can test quickly then I think you just drew the short
straw.  Should be a trivial patch...

Ross
<div dir="ltr">On 9 May 2018 at 17:00, Mark Asselstine <span dir="ltr">&lt;<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5"><span style="color:rgb(34,34,34)">I am also seeing build failures due to this conflict:</span><br></div></div>
<br>
ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/<br>
<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> is installed by both wayland and mesa, aborting<br>
..<br>
ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were <br>
installed but not shipped in any package:<br>
  /usr/lib64/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a><br>
Please set FILES such that these items are packaged. Alternatively if they are <br>
unneeded, avoid installing them or delete them within do_install.<br>
mesa: 1 installed and not shipped files. [installed-vs-shipped]<br>
<br>
is someone working on a fix or should I take some time to put something <br>
together?<br></blockquote><div><br></div><div>As it appears you can test quickly then I think you just drew the short straw.  Should be a trivial patch...</div><div><br></div><div>Ross </div></div></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Mark Asselstine May 9, 2018, 4:09 p.m. | #8
On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:
> On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>

> 

> wrote:

> > I am also seeing build failures due to this conflict:

> > 

> > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/

> > libwayland-egl.la is installed by both wayland and mesa, aborting

> > ..

> > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were

> > 

> > installed but not shipped in any package:

> >   /usr/lib64/libwayland-egl.la

> > 

> > Please set FILES such that these items are packaged. Alternatively if they

> > are

> > unneeded, avoid installing them or delete them within do_install.

> > mesa: 1 installed and not shipped files. [installed-vs-shipped]

> > 

> > is someone working on a fix or should I take some time to put something

> > together?

> 

> As it appears you can test quickly then I think you just drew the short

> straw.  Should be a trivial patch...


I knew that this had a 50/50 chance of going this way :). Lunch then a fix. I 
assume then we will go with Martin's suggestion of an explicit remove in 
mesa.inc?

Mark

> 

> Ross





-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross May 9, 2018, 4:15 p.m. | #9
I'd say that generalising rm -f ${D}${libdir}/libwayland-egl.so* to
libwayland-egl.* should to the trick.

Ross

On 9 May 2018 at 17:09, Mark Asselstine <mark.asselstine@windriver.com>
wrote:

> On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:

> > On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>

> >

> > wrote:

> > > I am also seeing build failures due to this conflict:

> > >

> > > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/

> > > libwayland-egl.la is installed by both wayland and mesa, aborting

> > > ..

> > > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories

> were

> > >

> > > installed but not shipped in any package:

> > >   /usr/lib64/libwayland-egl.la

> > >

> > > Please set FILES such that these items are packaged. Alternatively if

> they

> > > are

> > > unneeded, avoid installing them or delete them within do_install.

> > > mesa: 1 installed and not shipped files. [installed-vs-shipped]

> > >

> > > is someone working on a fix or should I take some time to put something

> > > together?

> >

> > As it appears you can test quickly then I think you just drew the short

> > straw.  Should be a trivial patch...

>

> I knew that this had a 50/50 chance of going this way :). Lunch then a

> fix. I

> assume then we will go with Martin's suggestion of an explicit remove in

> mesa.inc?

>

> Mark

>

> >

> > Ross

>

>

>

>

>
<div dir="ltr">I&#39;d say that generalising <span style="font-size:12.800000190734863px">rm -f ${D}${libdir}/libwayland-egl.</span><wbr style="font-size:12.800000190734863px"><span style="font-size:12.800000190734863px">so* to libwayland-egl.* should to the trick.</span><br style="font-size:12.800000190734863px"><div><span style="font-size:12.800000190734863px"><br></span></div><div><span style="font-size:12.800000190734863px">Ross</span></div></div><div class="gmail_extra"><br><div class="gmail_quote">On 9 May 2018 at 17:09, Mark Asselstine <span dir="ltr">&lt;<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:<br>
&gt; On 9 May 2018 at 17:00, Mark Asselstine &lt;<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>&gt;<br>
&gt; <br>
&gt; wrote:<br>
&gt; &gt; I am also seeing build failures due to this conflict:<br>
&gt; &gt; <br>
&gt; &gt; ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/<br>
&gt; &gt; <a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> is installed by both wayland and mesa, aborting<br>
&gt; &gt; ..<br>
&gt; &gt; ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were<br>
&gt; &gt; <br>
&gt; &gt; installed but not shipped in any package:<br>
&gt; &gt;   /usr/lib64/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a><br>
&gt; &gt; <br>
&gt; &gt; Please set FILES such that these items are packaged. Alternatively if they<br>
&gt; &gt; are<br>
&gt; &gt; unneeded, avoid installing them or delete them within do_install.<br>
&gt; &gt; mesa: 1 installed and not shipped files. [installed-vs-shipped]<br>
&gt; &gt; <br>
&gt; &gt; is someone working on a fix or should I take some time to put something<br>
&gt; &gt; together?<br>
&gt; <br>
&gt; As it appears you can test quickly then I think you just drew the short<br>
&gt; straw.  Should be a trivial patch...<br>
<br>
</span>I knew that this had a 50/50 chance of going this way :). Lunch then a fix. I <br>
assume then we will go with Martin&#39;s suggestion of an explicit remove in <br>
mesa.inc?<br>
<br>
Mark<br>
<br>
&gt; <br>
&gt; Ross<br>
<br>
<br>
<br>
<br>
</blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross May 9, 2018, 4:16 p.m. | #10
Good news: Denys beat you.

Ross

On 9 May 2018 at 17:09, Mark Asselstine <mark.asselstine@windriver.com>
wrote:

> On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:

> > On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>

> >

> > wrote:

> > > I am also seeing build failures due to this conflict:

> > >

> > > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/

> > > libwayland-egl.la is installed by both wayland and mesa, aborting

> > > ..

> > > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories

> were

> > >

> > > installed but not shipped in any package:

> > >   /usr/lib64/libwayland-egl.la

> > >

> > > Please set FILES such that these items are packaged. Alternatively if

> they

> > > are

> > > unneeded, avoid installing them or delete them within do_install.

> > > mesa: 1 installed and not shipped files. [installed-vs-shipped]

> > >

> > > is someone working on a fix or should I take some time to put something

> > > together?

> >

> > As it appears you can test quickly then I think you just drew the short

> > straw.  Should be a trivial patch...

>

> I knew that this had a 50/50 chance of going this way :). Lunch then a

> fix. I

> assume then we will go with Martin's suggestion of an explicit remove in

> mesa.inc?

>

> Mark

>

> >

> > Ross

>

>

>

>

>
<div dir="ltr">Good news: Denys beat you.<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 9 May 2018 at 17:09, Mark Asselstine <span dir="ltr">&lt;<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:<br>
&gt; On 9 May 2018 at 17:00, Mark Asselstine &lt;<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>&gt;<br>
&gt; <br>
&gt; wrote:<br>
&gt; &gt; I am also seeing build failures due to this conflict:<br>
&gt; &gt; <br>
&gt; &gt; ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/<br>
&gt; &gt; <a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> is installed by both wayland and mesa, aborting<br>
&gt; &gt; ..<br>
&gt; &gt; ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were<br>
&gt; &gt; <br>
&gt; &gt; installed but not shipped in any package:<br>
&gt; &gt;   /usr/lib64/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a><br>
&gt; &gt; <br>
&gt; &gt; Please set FILES such that these items are packaged. Alternatively if they<br>
&gt; &gt; are<br>
&gt; &gt; unneeded, avoid installing them or delete them within do_install.<br>
&gt; &gt; mesa: 1 installed and not shipped files. [installed-vs-shipped]<br>
&gt; &gt; <br>
&gt; &gt; is someone working on a fix or should I take some time to put something<br>
&gt; &gt; together?<br>
&gt; <br>
&gt; As it appears you can test quickly then I think you just drew the short<br>
&gt; straw.  Should be a trivial patch...<br>
<br>
</span>I knew that this had a 50/50 chance of going this way :). Lunch then a fix. I <br>
assume then we will go with Martin&#39;s suggestion of an explicit remove in <br>
mesa.inc?<br>
<br>
Mark<br>
<br>
&gt; <br>
&gt; Ross<br>
<br>
<br>
<br>
<br>
</blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Denys Dmytriyenko May 9, 2018, 4:19 p.m. | #11
On Tue, May 08, 2018 at 11:33:25PM +0200, Martin Jansa wrote:
> It's possible to remove them globally with:

> meta/classes/remove-libtool.bbclass

> but mesa.inc already removes some of the .la files selectively, so it would

> be nice to keep it working even for DISTROs which don't inherit

> remove-libtool bbclass (for whatever reason).


Ok, sent a patch to remove all libwayland-egl files, not just .so - should 
take care of .la as well.


> On Tue, May 8, 2018 at 11:28 PM, Denys Dmytriyenko <denis@denix.org> wrote:

> 

> > On Tue, May 08, 2018 at 11:18:44PM +0200, Martin Jansa wrote:

> > > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:

> > > > From: Denys Dmytriyenko <denys@ti.com>

> > > >

> > > > Official announcement:

> > > > https://lists.freedesktop.org/archives/wayland-devel/2018-

> > April/037767.html

> > > >

> > > > | libwayland-egl is now part of libwayland, and will presumably be

> > removed

> > > > | from mesa in the not too distant future.

> > > >

> > > > Update mesa recipe by removing corresponding libwayland-egl entries.

> > > >

> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > > > ---

> > > >  meta/recipes-graphics/mesa/mesa.inc                                |

> > 7 ++++---

> > > >  .../wayland/{wayland_1.14.0.bb => wayland_1.15.0.bb}               |

> > 4 ++--

> > > >  2 files changed, 6 insertions(+), 5 deletions(-)

> > > >  rename meta/recipes-graphics/wayland/{wayland_1.14.0.bb =>

> > wayland_1.15.0.bb} (92%)

> > > >

> > > > diff --git a/meta/recipes-graphics/mesa/mesa.inc

> > b/meta/recipes-graphics/mesa/mesa.inc

> > > > index b501b7e..c3a8e76 100644

> > > > --- a/meta/recipes-graphics/mesa/mesa.inc

> > > > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \

> > > >               libgles1-mesa libgles1-mesa-dev \

> > > >               libgles2-mesa libgles2-mesa-dev \

> > > >               libgles3-mesa libgles3-mesa-dev \

> > > > -             libwayland-egl libwayland-egl-dev \

> > > >               libxatracker libxatracker-dev \

> > > >               mesa-megadriver mesa-vulkan-drivers \

> > > >              "

> > > > @@ -134,6 +133,10 @@ do_install_append () {

> > > >      # it was packaged in libdricore9.1.3-1 and preventing upgrades

> > when debian.bbclass was used

> > > >      rm -f ${D}${sysconfdir}/drirc

> > > >      chrpath --delete ${D}${libdir}/dri/*_dri.so || true

> > > > +

> > > > +    # libwayland-egl has been moved to wayland 1.15+

> > > > +    rm -f ${D}${libdir}/libwayland-egl.so*

> > > > +    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc

> > >

> > > Shouldn't /usr/lib/libwayland-egl.la be removed as well? Now I'm getting

> > > many do_prepare_recipe_sysroot failures because both mesa and wayland

> > > provide this file.

> >

> > Don't we remove .la files in bulk? I didn't see this problem when I was

> > testing it. Plus it went through Ross' mut branch, then master-next and

> > presumably few autobuilder iterations?

> >

> > I can make the change to also remove .la, if it's really required.

> >

> >

> > > >  }

> > > >

> > > >  # For the packages that make up the OpenGL interfaces, inject

> > variables so that

> > > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"

> > > >  FILES_libgl-mesa = "${libdir}/libGL.so.*"

> > > >  FILES_libglapi = "${libdir}/libglapi.so.*"

> > > >  FILES_libosmesa = "${libdir}/libOSMesa.so.*"

> > > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"

> > > >  FILES_libxatracker = "${libdir}/libxatracker.so.*"

> > > >

> > > >  FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"

> > > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.*

> > ${includedir}/GLES ${libdir}/p

> > > >  FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2

> > ${libdir}/pkgconfig/glesv2.pc"

> > > >  FILES_libgles3-mesa-dev = "${includedir}/GLES3"

> > > >  FILES_libosmesa-dev = "${libdir}/libOSMesa.*

> > ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"

> > > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc

> > ${libdir}/libwayland-egl.*"

> > > >  FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/

> > libxatracker.la \

> > > >                            ${includedir}/xa_tracker.h

> > ${includedir}/xa_composite.h ${includedir}/xa_context.h \

> > > >                            ${libdir}/pkgconfig/xatracker.pc"

> > > > diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > > similarity index 92%

> > > > rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > > > rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > > index 1a9ff98..788105b 100644

> > > > --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb

> > > > +++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb

> > > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"

> > > >  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.

> > xz \

> > > >        file://fixpathinpcfiles.patch \

> > > >             "

> > > > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"

> > > > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aab

> > fc1ec9a13c86c98bbe2b812f008da27ab8"

> > > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"

> > > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db8

> > 00f587329067962dbf65e14488b4b7aeb0"

> > > >

> > > >  inherit autotools pkgconfig

> > > >

> > > > --

> > > > 2.7.4

> > > >

> > > > --

> > > > _______________________________________________

> > > > Openembedded-core mailing list

> > > > Openembedded-core@lists.openembedded.org

> > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core

> > >

> > > --

> > > Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

> >

> >

> >

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Mark Asselstine May 9, 2018, 5:59 p.m. | #12
On Wednesday, May 9, 2018 12:16:30 PM EDT Burton, Ross wrote:
> Good news: Denys beat you.


I need to take long lunches more often. Thanks Denys for taking care of this.

Mark

> 

> Ross

> 

> On 9 May 2018 at 17:09, Mark Asselstine <mark.asselstine@windriver.com>

> 

> wrote:

> > On Wednesday, May 9, 2018 12:03:26 PM EDT Burton, Ross wrote:

> > > On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>

> > > 

> > > wrote:

> > > > I am also seeing build failures due to this conflict:

> > > > 

> > > > ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file

> > > > /usr/lib64/

> > > > libwayland-egl.la is installed by both wayland and mesa, aborting

> > > > ..

> > > > ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories

> > 

> > were

> > 

> > > > installed but not shipped in any package:

> > > >   /usr/lib64/libwayland-egl.la

> > > > 

> > > > Please set FILES such that these items are packaged. Alternatively if

> > 

> > they

> > 

> > > > are

> > > > unneeded, avoid installing them or delete them within do_install.

> > > > mesa: 1 installed and not shipped files. [installed-vs-shipped]

> > > > 

> > > > is someone working on a fix or should I take some time to put

> > > > something

> > > > together?

> > > 

> > > As it appears you can test quickly then I think you just drew the short

> > > straw.  Should be a trivial patch...

> > 

> > I knew that this had a 50/50 chance of going this way :). Lunch then a

> > fix. I

> > assume then we will go with Martin's suggestion of an explicit remove in

> > mesa.inc?

> > 

> > Mark

> > 

> > > Ross





-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Martin Jansa May 9, 2018, 6:07 p.m. | #13
I have this:
http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&id=3271564498b37cb0faadd2ec7c8de8d853db9f2b

On Wed, May 9, 2018 at 6:03 PM, Burton, Ross <ross.burton@intel.com> wrote:

> On 9 May 2018 at 17:00, Mark Asselstine <mark.asselstine@windriver.com>

> wrote:

>

>> I am also seeing build failures due to this conflict:

>>

>> ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/

>> libwayland-egl.la is installed by both wayland and mesa, aborting

>> ..

>> ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories

>> were

>> installed but not shipped in any package:

>>   /usr/lib64/libwayland-egl.la

>> Please set FILES such that these items are packaged. Alternatively if

>> they are

>> unneeded, avoid installing them or delete them within do_install.

>> mesa: 1 installed and not shipped files. [installed-vs-shipped]

>>

>> is someone working on a fix or should I take some time to put something

>> together?

>>

>

> As it appears you can test quickly then I think you just drew the short

> straw.  Should be a trivial patch...

>

> Ross

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>

>
<div dir="ltr"><div>I have this:</div><a href="http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&amp;id=3271564498b37cb0faadd2ec7c8de8d853db9f2b">http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&amp;id=3271564498b37cb0faadd2ec7c8de8d853db9f2b</a><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 9, 2018 at 6:03 PM, Burton, Ross <span dir="ltr">&lt;<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><span class="">On 9 May 2018 at 17:00, Mark Asselstine <span dir="ltr">&lt;<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a><wbr>&gt;</span> wrote:<br></span><div class="gmail_extra"><div class="gmail_quote"><span class=""><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="m_3218767526090920232HOEnZb"><div class="m_3218767526090920232h5"><span style="color:rgb(34,34,34)">I am also seeing build failures due to this conflict:</span><br></div></div>
<br>
ERROR: libglu-2_9.0.0-0 do_prepare_recipe_sysroot: The file /usr/lib64/<br>
<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> is installed by both wayland and mesa, aborting<br>
..<br>
ERROR: mesa-2_18.0.2-r0 do_package: QA Issue: mesa: Files/directories were <br>
installed but not shipped in any package:<br>
  /usr/lib64/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a><br>
Please set FILES such that these items are packaged. Alternatively if they are <br>
unneeded, avoid installing them or delete them within do_install.<br>
mesa: 1 installed and not shipped files. [installed-vs-shipped]<br>
<br>
is someone working on a fix or should I take some time to put something <br>
together?<br></blockquote><div><br></div></span><div>As it appears you can test quickly then I think you just drew the short straw.  Should be a trivial patch...</div><span class="HOEnZb"><font color="#888888"><div><br></div><div>Ross </div></font></span></div></div></div>
<br>-- <br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
<br></blockquote></div><br></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index b501b7e..c3a8e76 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -119,7 +119,6 @@  PACKAGES =+ "libegl-mesa libegl-mesa-dev \
              libgles1-mesa libgles1-mesa-dev \
              libgles2-mesa libgles2-mesa-dev \
              libgles3-mesa libgles3-mesa-dev \
-             libwayland-egl libwayland-egl-dev \
              libxatracker libxatracker-dev \
              mesa-megadriver mesa-vulkan-drivers \
             "
@@ -134,6 +133,10 @@  do_install_append () {
     # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used 
     rm -f ${D}${sysconfdir}/drirc
     chrpath --delete ${D}${libdir}/dri/*_dri.so || true
+
+    # libwayland-egl has been moved to wayland 1.15+
+    rm -f ${D}${libdir}/libwayland-egl.so*
+    rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
 }
 
 # For the packages that make up the OpenGL interfaces, inject variables so that
@@ -204,7 +207,6 @@  FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"
 FILES_libgl-mesa = "${libdir}/libGL.so.*"
 FILES_libglapi = "${libdir}/libglapi.so.*"
 FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*"
 FILES_libxatracker = "${libdir}/libxatracker.so.*"
 
 FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"
@@ -216,7 +218,6 @@  FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p
 FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"
 FILES_libgles3-mesa-dev = "${includedir}/GLES3"
 FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
-FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*"
 FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
                           ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
                           ${libdir}/pkgconfig/xatracker.pc"
diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
similarity index 92%
rename from meta/recipes-graphics/wayland/wayland_1.14.0.bb
rename to meta/recipes-graphics/wayland/wayland_1.15.0.bb
index 1a9ff98..788105b 100644
--- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb
+++ b/meta/recipes-graphics/wayland/wayland_1.15.0.bb
@@ -15,8 +15,8 @@  DEPENDS = "expat libxml2 libffi wayland-native"
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
 	   file://fixpathinpcfiles.patch \
            "
-SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108"
-SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8"
+SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92fd2"
+SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db800f587329067962dbf65e14488b4b7aeb0"
 
 inherit autotools pkgconfig