summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-02-26 00:52:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-05 22:24:06 +0000
commitfbb688ab3eeca1bbfbaaaaffd8c81fd8052bcc68 (patch)
tree9f0ebec097688e829259cd2a8a409bc6c0b65fca
parent266e73a99b54f741bdbe5d689933c46b2b4731fd (diff)
downloadopenembedded-core-fbb688ab3eeca1bbfbaaaaffd8c81fd8052bcc68.tar.gz
openembedded-core-fbb688ab3eeca1bbfbaaaaffd8c81fd8052bcc68.tar.bz2
openembedded-core-fbb688ab3eeca1bbfbaaaaffd8c81fd8052bcc68.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 0cc0a82de4..f47f1aa20d 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.*"