Skip to contentSkip to conversation

mesa: ship /etc/drirc in mesa-megadriver

PATCH In review Ross Burton 2 participants 2 messages Feb 26, 2019 – Mar 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mesa: ship /etc/drirc in mesa-megadriver

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.

---
 meta/recipes-graphics/mesa/mesa.inc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta/recipes-graphics/mesa/mesa.inc +2 -4
index 0cc0a82de49..f47f1aa20d8 100644
@@ -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.*"
Signature · 1 line
2.11.0
#1 lore raw

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.

Quoted 45 lines · Ross Burton

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.

---
 meta/recipes-graphics/mesa/mesa.inc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
meta/recipes-graphics/mesa/mesa.inc +0 -1
index 0cc0a82de49..f47f1aa20d8 100644
@@ -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

meta/recipes-graphics/mesa/mesa.inc +2 -4
-    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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core