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-kernel/kernel-module-vspmif | |
| 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-kernel/kernel-module-vspmif')
| -rw-r--r-- | meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend index a0c4d94c2..226fa11ac 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspm-if.bbappend @@ -1,27 +1,3 @@ KERNEL_MODULE_AUTOLOAD:append = " vspm_if" 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 - - # Add a rule to ensure the 'display' user has permission to access - install -d ${D}${sysconfdir}/udev/rules.d - cat >${D}${sysconfdir}/udev/rules.d/56-vspm_if.rules <<'EOF' -KERNEL=="vspm_if", MODE="0660", GROUP="display" -EOF -} - -# Required to guarantee the module goes into the expected -# kernel-module-vspmif package and doesn't end up packaged in -# kernel-module-vspm-if by the default behavior. Can be removed if -# upstream correctly use ${nonarch_base_libdir} themselves. -FILES:${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/vspm_if.ko" - -FILES:${PN}:append = " \ - ${sysconfdir}/udev/rules.d/*.rules \ -" |