X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-graphics%2Fgles-module%2Fgles-user-module.bbappend;h=e191617afe27239eac492e4d9163bf046f628a44;hb=refs%2Fchanges%2F92%2F28192%2F3;hp=7beb4c25cdf7c3e3113fc014a2caf47733988c1b;hpb=4de878ba8faedeb27456271ac0e1f867791d66e7;p=AGL%2Fmeta-agl.git

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 7beb4c25c..e191617af 100644
--- 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,6 +3,19 @@ require checksum_control.inc
 RDEPENDS:${PN}:append = " wayland-wsegl"
 
 do_install:append(){
-	 sed -i 's/MODE="0660", OWNER/MODE="0660", SECLABEL{smack}="*", OWNER/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 
+    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
+
+    # Undo upstream's out of date use of weston@.service
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)} ; then
+        # Fix weston dependency, needs to be weston.service
+        sed -i 's/^RequiredBy=weston@.service$/RequiredBy=weston.service/' \
+                ${D}${systemd_system_unitdir}/rc.pvr.service
+    fi
 }