From dfb4d68772b4c04cad2fc45d81efb6f648017019 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 10 Nov 2022 15:45:15 -0500 Subject: meta-agl-bsp: Fix rc.pvr.service dependency for meta-rcar-gen3 Undo the out of date tweak of rc.pvr.service to make it a dependency of weston@.service done in meta-rcar-gen3's gles-user-module recipe. For now, just tweak the dependency back to weston.service in our bbappend in meta-agl-bsp, this can be removed when meta-rcar-gen3 includes a fix. Bug-AGL: SPEC-4607 Change-Id: I16ef13d2af9b2ed485ce8b98501f39bf96aba3e2 Signed-off-by: Scott Murray Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28142 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- .../recipes-graphics/gles-module/gles-user-module.bbappend | 7 +++++++ 1 file changed, 7 insertions(+) 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 bd7fdf207..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 @@ -11,4 +11,11 @@ do_install:append(){ 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