| Message ID | 20190226005221.27806-1-ross.burton@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [thud] mesa: ship /etc/drirc in mesa-megadriver | expand |
Interesting side-effect of this is that mesa package used to ship empty /etc directory before, now it's empty and not created. So be aware that if you had image/packagegroup installing mesa package for whatever reason (by mistake most likely), you'll need to adjust that in thud. On Tue, Feb 26, 2019 at 1:52 AM Ross Burton <ross.burton@intel.com> wrote: > Many years not shipping the stub drirc seemed like a good idea, > but now it has content and is essential for some applications to run. > > Following patches in master, ship this file in mesa-megadriver. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-graphics/mesa/mesa.inc | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-graphics/mesa/mesa.inc > b/meta/recipes-graphics/mesa/mesa.inc > index 0cc0a82de49..f47f1aa20d8 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -141,8 +141,6 @@ do_install_append () { > rm -f ${D}${libdir}/gallium-pipe/*.la > rm -f ${D}${libdir}/gbm/*.la > > - # 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+ > @@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " > > PACKAGES_DYNAMIC += "^mesa-driver-.*" > > -FILES_${PN} += "${sysconfdir}/drirc" > -FILES_mesa-megadriver = "${libdir}/dri/*" > +FILES_${PN} = "" > +FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}" > FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" > FILES_libegl-mesa = "${libdir}/libEGL.so.*" > FILES_libgbm = "${libdir}/libgbm.so.*" > -- > 2.11.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > <div dir="ltr">Interesting side-effect of this is that mesa package used to ship empty /etc directory before, now it's empty and not created.<div><br></div><div>So be aware that if you had image/packagegroup installing mesa package for whatever reason (by mistake most likely), you'll need to adjust that in thud.</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Feb 26, 2019 at 1:52 AM Ross Burton <<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Many years not shipping the stub drirc seemed like a good idea,<br> but now it has content and is essential for some applications to run.<br> <br> Following patches in master, ship this file in mesa-megadriver.<br> <br> Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br> ---<br> meta/recipes-graphics/mesa/mesa.inc | 6 ++----<br> 1 file changed, 2 insertions(+), 4 deletions(-)<br> <br> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc<br> index 0cc0a82de49..f47f1aa20d8 100644<br> --- a/meta/recipes-graphics/mesa/mesa.inc<br> +++ b/meta/recipes-graphics/mesa/mesa.inc<br> @@ -141,8 +141,6 @@ do_install_append () {<br> rm -f ${D}${libdir}/gallium-pipe/*.la<br> rm -f ${D}${libdir}/gbm/*.la<br> <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> @@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages "<br> <br> PACKAGES_DYNAMIC += "^mesa-driver-.*"<br> <br> -FILES_${PN} += "${sysconfdir}/drirc"<br> -FILES_mesa-megadriver = "${libdir}/dri/*"<br> +FILES_${PN} = ""<br> +FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}"<br> FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan"<br> FILES_libegl-mesa = "${libdir}/libEGL.so.*"<br> FILES_libgbm = "${libdir}/libgbm.so.*"<br> -- <br> 2.11.0<br> <br> -- <br> _______________________________________________<br> Openembedded-core mailing list<br> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br> </blockquote></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 0cc0a82de49..f47f1aa20d8 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -141,8 +141,6 @@ do_install_append () { rm -f ${D}${libdir}/gallium-pipe/*.la rm -f ${D}${libdir}/gbm/*.la - # 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+ @@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" -FILES_${PN} += "${sysconfdir}/drirc" -FILES_mesa-megadriver = "${libdir}/dri/*" +FILES_${PN} = "" +FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*"
Many years not shipping the stub drirc seemed like a good idea, but now it has content and is essential for some applications to run. Following patches in master, ship this file in mesa-megadriver. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/mesa/mesa.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core