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 --- .../kernel-module-mmngr/kernel-module-mmngr.bbappend | 11 ----------- .../kernel-module-mmngr/kernel-module-mmngrbuf.bbappend | 11 ----------- 2 files changed, 22 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend index 1d602cd16..98b8e92c3 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend @@ -1,13 +1,2 @@ KERNEL_MODULE_AUTOLOAD:append = " mmngr" KERNEL_MODULE_PACKAGE_SUFFIX = "" - -do_install:append() { - # Work around upstream not using ${nonarch_base_libdir}/modules - if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -d ${D}/lib/modules ]; then - install -d ${D}${nonarch_base_libdir}/ - mv ${D}/lib/modules ${D}${nonarch_base_libdir}/ - rm -rf ${D}/lib - fi - fi -} diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend index 879d0e174..fbff56fff 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bbappend @@ -1,13 +1,2 @@ KERNEL_MODULE_AUTOLOAD:append = " mmngrbuf" KERNEL_MODULE_PACKAGE_SUFFIX = "" - -do_install:append() { - # Work around upstream not using ${nonarch_base_libdir}/modules - if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then - if [ -d ${D}/lib/modules ]; then - install -d ${D}${nonarch_base_libdir}/ - mv ${D}/lib/modules ${D}${nonarch_base_libdir}/ - rm -rf ${D}/lib - fi - fi -} -- cgit 1.2.3-korg