From 88d253bfb9a67a294ea12627c06220c50096de79 Mon Sep 17 00:00:00 2001 From: Hau Vo Date: Tue, 8 Aug 2023 11:14:12 +0900 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 Cherry-pick from: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29043 Signed-off-by: Scott Murray Signed-off-by: Hau Vo Change-Id: If2bbc2d699377fc2ade78a92f0bb6fd6f0a5a1e4 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29104 Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../kernel-module-mmngr/kernel-module-mmngr.bbappend | 9 --------- 1 file changed, 9 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bbappend') 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 6e4b9a024..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,11 +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 - install -d ${D}${nonarch_base_libdir}/ - mv ${D}/lib/modules ${D}${nonarch_base_libdir}/ - rm -rf ${D}/lib - fi -} -- cgit 1.2.3-korg