diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-03-20 02:01:13 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-03-20 02:01:13 +0300 |
commit | e5c10e334eee83873c5bc09aac722e12c802c5ff (patch) | |
tree | 2b5e2d8fc54e4a6c04836ab2f935a21d661b2c1e /poky/meta/recipes-graphics | |
parent | 0a33a7ec0b66a3dc40ece30d75cec2afb79ab743 (diff) | |
parent | a9d9e970071285a9c9fd574774356d4489cce1db (diff) | |
download | openbmc-e5c10e334eee83873c5bc09aac722e12c802c5ff.tar.xz |
Merge commit 'a9d9e970071285a9c9fd574774356d4489cce1db' of ssh://github.com/openbmc/openbmc into update2
Diffstat (limited to 'poky/meta/recipes-graphics')
-rw-r--r-- | poky/meta/recipes-graphics/mesa/mesa.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index 0cc0a82de..f47f1aa20 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/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.*" |