diff options
author | Ross Burton <ross.burton@intel.com> | 2019-02-26 00:52:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-05 22:24:13 +0000 |
commit | f5a57e939e626a5b7c6de5b51799ca602ed355ed (patch) | |
tree | 193252e90c5671da2a25e8a20fd0b295b42edf36 | |
parent | 1c8d0dbe673308deae3019535c67a471f95d7c69 (diff) | |
download | poky-f5a57e939e626a5b7c6de5b51799ca602ed355ed.tar.gz |
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.
(From OE-Core rev: fbb688ab3eeca1bbfbaaaaffd8c81fd8052bcc68)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/mesa/mesa.inc | 6 |
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 () { | |||
141 | rm -f ${D}${libdir}/gallium-pipe/*.la | 141 | rm -f ${D}${libdir}/gallium-pipe/*.la |
142 | rm -f ${D}${libdir}/gbm/*.la | 142 | rm -f ${D}${libdir}/gbm/*.la |
143 | 143 | ||
144 | # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used | ||
145 | rm -f ${D}${sysconfdir}/drirc | ||
146 | chrpath --delete ${D}${libdir}/dri/*_dri.so || true | 144 | chrpath --delete ${D}${libdir}/dri/*_dri.so || true |
147 | 145 | ||
148 | # libwayland-egl has been moved to wayland 1.15+ | 146 | # libwayland-egl has been moved to wayland 1.15+ |
@@ -209,8 +207,8 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " | |||
209 | 207 | ||
210 | PACKAGES_DYNAMIC += "^mesa-driver-.*" | 208 | PACKAGES_DYNAMIC += "^mesa-driver-.*" |
211 | 209 | ||
212 | FILES_${PN} += "${sysconfdir}/drirc" | 210 | FILES_${PN} = "" |
213 | FILES_mesa-megadriver = "${libdir}/dri/*" | 211 | FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}" |
214 | FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" | 212 | FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" |
215 | FILES_libegl-mesa = "${libdir}/libEGL.so.*" | 213 | FILES_libegl-mesa = "${libdir}/libEGL.so.*" |
216 | FILES_libgbm = "${libdir}/libgbm.so.*" | 214 | FILES_libgbm = "${libdir}/libgbm.so.*" |