From adabd19ec49fef0e39ec33b0887a1bec5fad94a0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 6 Jul 2023 17:18:22 -0400 Subject: 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 Change-Id: Ieaebb24385f9d75eaad012043993dcfc733aa01a Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29043 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../gles-module/gles-user-module.bbappend | 16 ---------------- 1 file changed, 16 deletions(-) (limited to '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 d6b220e1c..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,19 +1,3 @@ require checksum_control.inc RDEPENDS:${PN}:append = " wayland-wsegl" - -do_install:append(){ - # 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 -} -- cgit 1.2.3-korg