| Message ID | 1523387170-30191-1-git-send-email-denis@denix.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] wayland: upgrade to 1.15.0 | expand |
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
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
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'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'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"><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:<br> > > From: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > <br> > > Official announcement:<br> > > <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> > > <br> > > | libwayland-egl is now part of libwayland, and will presumably be removed<br> > > | from mesa in the not too distant future.<br> > > <br> > > Update mesa recipe by removing corresponding libwayland-egl entries.<br> > > <br> > > Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > ---<br> > > meta/recipes-graphics/mesa/<wbr>mesa.inc | 7 ++++---<br> > > .../wayland/{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> => <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} | 4 ++--<br> > > 2 files changed, 6 insertions(+), 5 deletions(-)<br> > > rename meta/recipes-graphics/wayland/<wbr>{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> => <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} (92%)<br> > > <br> > > diff --git a/meta/recipes-graphics/mesa/<wbr>mesa.inc b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br> > > index b501b7e..c3a8e76 100644<br> > > --- a/meta/recipes-graphics/mesa/<wbr>mesa.inc<br> > > +++ b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \<br> > > libgles1-mesa libgles1-mesa-dev \<br> > > libgles2-mesa libgles2-mesa-dev \<br> > > libgles3-mesa libgles3-mesa-dev \<br> > > - libwayland-egl libwayland-egl-dev \<br> > > libxatracker libxatracker-dev \<br> > > mesa-megadriver mesa-vulkan-drivers \<br> > > "<br> > > @@ -134,6 +133,10 @@ do_install_append () {<br> > > # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used <br> > > rm -f ${D}${sysconfdir}/drirc<br> > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true<br> > > +<br> > > + # libwayland-egl has been moved to wayland 1.15+<br> > > + rm -f ${D}${libdir}/libwayland-egl.<wbr>so*<br> > > + rm -f ${D}${libdir}/pkgconfig/<wbr>wayland-egl.pc<br> > <br> > Shouldn't /usr/lib/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> be removed as well? Now I'm getting<br> > many do_prepare_recipe_sysroot failures because both mesa and wayland<br> > provide this file.<br> <br> </div></div>Don't we remove .la files in bulk? I didn't see this problem when I was <br> testing it. Plus it went through Ross' mut branch, then master-next and <br> presumably few autobuilder iterations?<br> <br> I can make the change to also remove .la, if it's really required.<br> <div class="HOEnZb"><div class="h5"><br> <br> > > }<br> > > <br> > > # For the packages that make up the OpenGL interfaces, inject variables so that<br> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"<br> > > FILES_libgl-mesa = "${libdir}/libGL.so.*"<br> > > FILES_libglapi = "${libdir}/libglapi.so.*"<br> > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"<br> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*<wbr>"<br> > > FILES_libxatracker = "${libdir}/libxatracker.so.*"<br> > > <br> > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"<br> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p<br> > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"<br> > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"<br> > > FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"<br> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-<wbr>egl.pc ${libdir}/libwayland-egl.*"<br> > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la" rel="noreferrer" target="_blank">libxatracker.la</a> \<br> > > ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \<br> > > ${libdir}/pkgconfig/xatracker.<wbr>pc"<br> > > 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> > > similarity index 92%<br> > > 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> > > 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> > > index 1a9ff98..788105b 100644<br> > > --- 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> > > +++ 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> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"<br> > > SRC_URI = "<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> > > file://fixpathinpcfiles.patch \<br> > > "<br> > > -SRC_URI[md5sum] = "<wbr>0235f6075c32c3be61cff94fa0b9f1<wbr>08"<br> > > -SRC_URI[sha256sum] = "<wbr>ed80cabc0961a759a42092e2c39aab<wbr>fc1ec9a13c86c98bbe2b812f008da2<wbr>7ab8"<br> > > +SRC_URI[md5sum] = "<wbr>b7393c17fdce9a8d383edab656c92f<wbr>d2"<br> > > +SRC_URI[sha256sum] = "<wbr>eb3fbebb8559d56a80ad3753ec3db8<wbr>00f587329067962dbf65e14488b4b7<wbr>aeb0"<br> > > <br> > > inherit autotools pkgconfig<br> > > <br> > > -- <br> > > 2.7.4<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> > <br> > -- <br> > Martin 'JaMa' 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
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't build anything Wayland.<div><br></div><div>I'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"><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:<br> > > From: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > <br> > > Official announcement:<br> > > <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> > > <br> > > | libwayland-egl is now part of libwayland, and will presumably be removed<br> > > | from mesa in the not too distant future.<br> > > <br> > > Update mesa recipe by removing corresponding libwayland-egl entries.<br> > > <br> > > Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > ---<br> > > meta/recipes-graphics/mesa/<wbr>mesa.inc | 7 ++++---<br> > > .../wayland/{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> => <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} | 4 ++--<br> > > 2 files changed, 6 insertions(+), 5 deletions(-)<br> > > rename meta/recipes-graphics/wayland/<wbr>{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> => <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} (92%)<br> > > <br> > > diff --git a/meta/recipes-graphics/mesa/<wbr>mesa.inc b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br> > > index b501b7e..c3a8e76 100644<br> > > --- a/meta/recipes-graphics/mesa/<wbr>mesa.inc<br> > > +++ b/meta/recipes-graphics/mesa/<wbr>mesa.inc<br> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \<br> > > libgles1-mesa libgles1-mesa-dev \<br> > > libgles2-mesa libgles2-mesa-dev \<br> > > libgles3-mesa libgles3-mesa-dev \<br> > > - libwayland-egl libwayland-egl-dev \<br> > > libxatracker libxatracker-dev \<br> > > mesa-megadriver mesa-vulkan-drivers \<br> > > "<br> > > @@ -134,6 +133,10 @@ do_install_append () {<br> > > # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used <br> > > rm -f ${D}${sysconfdir}/drirc<br> > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true<br> > > +<br> > > + # libwayland-egl has been moved to wayland 1.15+<br> > > + rm -f ${D}${libdir}/libwayland-egl.<wbr>so*<br> > > + rm -f ${D}${libdir}/pkgconfig/<wbr>wayland-egl.pc<br> > <br> > Shouldn't /usr/lib/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> be removed as well? Now I'm getting<br> > many do_prepare_recipe_sysroot failures because both mesa and wayland<br> > provide this file.<br> <br> </div></div>Don't we remove .la files in bulk? I didn't see this problem when I was <br> testing it. Plus it went through Ross' mut branch, then master-next and <br> presumably few autobuilder iterations?<br> <br> I can make the change to also remove .la, if it's really required.<br> <div class="HOEnZb"><div class="h5"><br> <br> > > }<br> > > <br> > > # For the packages that make up the OpenGL interfaces, inject variables so that<br> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"<br> > > FILES_libgl-mesa = "${libdir}/libGL.so.*"<br> > > FILES_libglapi = "${libdir}/libglapi.so.*"<br> > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"<br> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*<wbr>"<br> > > FILES_libxatracker = "${libdir}/libxatracker.so.*"<br> > > <br> > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"<br> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p<br> > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"<br> > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"<br> > > FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"<br> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-<wbr>egl.pc ${libdir}/libwayland-egl.*"<br> > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la" rel="noreferrer" target="_blank">libxatracker.la</a> \<br> > > ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \<br> > > ${libdir}/pkgconfig/xatracker.<wbr>pc"<br> > > 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> > > similarity index 92%<br> > > 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> > > 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> > > index 1a9ff98..788105b 100644<br> > > --- 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> > > +++ 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> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"<br> > > SRC_URI = "<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> > > file://fixpathinpcfiles.patch \<br> > > "<br> > > -SRC_URI[md5sum] = "<wbr>0235f6075c32c3be61cff94fa0b9f1<wbr>08"<br> > > -SRC_URI[sha256sum] = "<wbr>ed80cabc0961a759a42092e2c39aab<wbr>fc1ec9a13c86c98bbe2b812f008da2<wbr>7ab8"<br> > > +SRC_URI[md5sum] = "<wbr>b7393c17fdce9a8d383edab656c92f<wbr>d2"<br> > > +SRC_URI[sha256sum] = "<wbr>eb3fbebb8559d56a80ad3753ec3db8<wbr>00f587329067962dbf65e14488b4b7<wbr>aeb0"<br> > > <br> > > inherit autotools pkgconfig<br> > > <br> > > -- <br> > > 2.7.4<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> > <br> > -- <br> > Martin 'JaMa' 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
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've noticed the issue in DISTRO which doesn'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"><<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>></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't build anything Wayland.<div><br></div><div>I'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"><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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> > On Tue, Apr 10, 2018 at 03:06:09PM -0400, Denys Dmytriyenko wrote:<br> > > From: Denys Dmytriyenko <<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>><br> > > <br> > > Official announcement:<br> > > <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> > > <br> > > | libwayland-egl is now part of libwayland, and will presumably be removed<br> > > | from mesa in the not too distant future.<br> > > <br> > > Update mesa recipe by removing corresponding libwayland-egl entries.<br> > > <br> > > Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>><br> > > ---<br> > > meta/recipes-graphics/mesa/mes<wbr>a.inc | 7 ++++---<br> > > .../wayland/{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> => <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} | 4 ++--<br> > > 2 files changed, 6 insertions(+), 5 deletions(-)<br> > > rename meta/recipes-graphics/wayland/<wbr>{<a href="http://wayland_1.14.0.bb" rel="noreferrer" target="_blank">wayland_1.14.0.bb</a> => <a href="http://wayland_1.15.0.bb" rel="noreferrer" target="_blank">wayland_1.15.0.bb</a>} (92%)<br> > > <br> > > diff --git a/meta/recipes-graphics/mesa/m<wbr>esa.inc b/meta/recipes-graphics/mesa/m<wbr>esa.inc<br> > > index b501b7e..c3a8e76 100644<br> > > --- a/meta/recipes-graphics/mesa/m<wbr>esa.inc<br> > > +++ b/meta/recipes-graphics/mesa/m<wbr>esa.inc<br> > > @@ -119,7 +119,6 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \<br> > > libgles1-mesa libgles1-mesa-dev \<br> > > libgles2-mesa libgles2-mesa-dev \<br> > > libgles3-mesa libgles3-mesa-dev \<br> > > - libwayland-egl libwayland-egl-dev \<br> > > libxatracker libxatracker-dev \<br> > > mesa-megadriver mesa-vulkan-drivers \<br> > > "<br> > > @@ -134,6 +133,10 @@ do_install_append () {<br> > > # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used <br> > > rm -f ${D}${sysconfdir}/drirc<br> > > chrpath --delete ${D}${libdir}/dri/*_dri.so || true<br> > > +<br> > > + # libwayland-egl has been moved to wayland 1.15+<br> > > + rm -f ${D}${libdir}/libwayland-egl.s<wbr>o*<br> > > + rm -f ${D}${libdir}/pkgconfig/waylan<wbr>d-egl.pc<br> > <br> > Shouldn't /usr/lib/<a href="http://libwayland-egl.la" rel="noreferrer" target="_blank">libwayland-egl.la</a> be removed as well? Now I'm getting<br> > many do_prepare_recipe_sysroot failures because both mesa and wayland<br> > provide this file.<br> <br> </div></div>Don't we remove .la files in bulk? I didn't see this problem when I was <br> testing it. Plus it went through Ross' mut branch, then master-next and <br> presumably few autobuilder iterations?<br> <br> I can make the change to also remove .la, if it's really required.<br> <div class="m_-7731596195213158602HOEnZb"><div class="m_-7731596195213158602h5"><br> <br> > > }<br> > > <br> > > # For the packages that make up the OpenGL interfaces, inject variables so that<br> > > @@ -204,7 +207,6 @@ FILES_libgles2-mesa = "${libdir}/libGLESv2.so.*"<br> > > FILES_libgl-mesa = "${libdir}/libGL.so.*"<br> > > FILES_libglapi = "${libdir}/libglapi.so.*"<br> > > FILES_libosmesa = "${libdir}/libOSMesa.so.*"<br> > > -FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*<wbr>"<br> > > FILES_libxatracker = "${libdir}/libxatracker.so.*"<br> > > <br> > > FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan"<br> > > @@ -216,7 +218,6 @@ FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/p<br> > > FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc"<br> > > FILES_libgles3-mesa-dev = "${includedir}/GLES3"<br> > > FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"<br> > > -FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-e<wbr>gl.pc ${libdir}/libwayland-egl.*"<br> > > FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/<a href="http://libxatracker.la" rel="noreferrer" target="_blank">libxatracker.la</a> \<br> > > ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \<br> > > ${libdir}/pkgconfig/xatracker.<wbr>pc"<br> > > 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> > > similarity index 92%<br> > > 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> > > 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> > > index 1a9ff98..788105b 100644<br> > > --- 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> > > +++ 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> > > @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native"<br> > > SRC_URI = "<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> > > file://fixpathinpcfiles.patch \<br> > > "<br> > > -SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f<wbr>108"<br> > > -SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aa<wbr>bfc1ec9a13c86c98bbe2b812f008da<wbr>27ab8"<br> > > +SRC_URI[md5sum] = "b7393c17fdce9a8d383edab656c92<wbr>fd2"<br> > > +SRC_URI[sha256sum] = "eb3fbebb8559d56a80ad3753ec3db<wbr>800f587329067962dbf65e14488b4b<wbr>7aeb0"<br> > > <br> > > inherit autotools pkgconfig<br> > > <br> > > -- <br> > > 2.7.4<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> > <br> > -- <br> > Martin 'JaMa' 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
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
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"><<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>></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
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
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'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"><<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>></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>
> On 9 May 2018 at 17:00, Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
> <br>
> wrote:<br>
> > I am also seeing build failures due to this conflict:<br>
> > <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>
> > <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>
> > <br>
> > Please set FILES such that these items are packaged. Alternatively if they<br>
> > 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>
> <br>
> As it appears you can test quickly then I think you just drew the short<br>
> 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's suggestion of an explicit remove in <br>
mesa.inc?<br>
<br>
Mark<br>
<br>
> <br>
> 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
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"><<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>></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> > On 9 May 2018 at 17:00, Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br> > <br> > wrote:<br> > > I am also seeing build failures due to this conflict:<br> > > <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> > > <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> > > <br> > > Please set FILES such that these items are packaged. Alternatively if they<br> > > 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> > <br> > As it appears you can test quickly then I think you just drew the short<br> > 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's suggestion of an explicit remove in <br> mesa.inc?<br> <br> Mark<br> <br> > <br> > 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
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
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
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&id=3271564498b37cb0faadd2ec7c8de8d853db9f2b">http://git.openembedded.org/openembedded-core-contrib/commit/?h=jansa/master&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"><<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>></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"><<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a><wbr>></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
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