diff options
author | Hau Vo <hau.vo.ra@renesas.com> | 2023-08-08 11:14:12 +0900 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2023-08-09 21:16:14 +0000 |
commit | 88d253bfb9a67a294ea12627c06220c50096de79 (patch) | |
tree | 821bdf12dc7a73ef6ea493e5bbb6b874e14cac64 /meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend | |
parent | 2fc0726d1f7e2a0f224dcc304546386b71b5e6c0 (diff) |
meta-agl-bsp: remove now unnecessary workarounds
Remove our usrmerge workarounds since meta-rcar-gen3 now has been
fixed. Also remove now unnecessary workarounds for the "display"
user and weston systemd unit naming.
Bug-AGL: SPEC-4854
Cherry-pick from: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29043
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Hau Vo <hau.vo.ra@renesas.com>
Change-Id: If2bbc2d699377fc2ade78a92f0bb6fd6f0a5a1e4
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29104
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend')
-rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-graphics/gles-module/gles-user-module.bbappend | 18 |
1 files changed, 0 insertions, 18 deletions
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 e191617af..8f2d47adc 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 @@ -1,21 +1,3 @@ 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 - - # 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 -} |