Enable usrmerge

[AGL/meta-agl.git] / meta-agl-bsp / meta-rcar-gen3 / recipes-graphics / gles-module / gles-user-module.bbappend

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
index 66b9c46..bd7fdf2 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend
@@ -3,5 +3,12 @@ require checksum_control.inc
 RDEPENDS:${PN}:append = " wayland-wsegl"
 
 do_install:append(){
-        sed -i 's/GROUP="video"/GROUP="display"/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules 
+    sed -i 's/GROUP="video"/GROUP="display"/g' ${D}${sysconfdir}/udev/rules.d/72-pvr-seat.rules
+
+    # Work around upstream not using ${nonarch_base_libdir}/firmware
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
+        install -d ${D}${nonarch_base_libdir}/
+        mv ${D}/lib/firmware ${D}${nonarch_base_libdir}/
+        rm -rf ${D}/lib
+    fi
 }