summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2023-07-06 17:18:22 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-07-18 14:22:27 +0000
commitadabd19ec49fef0e39ec33b0887a1bec5fad94a0 (patch)
tree52a60d8a7d89ea7cf151386b732786d4bf5ade67 /meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif
parent599ca3f2c22720d7154dfc371c573b8c602f7969 (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 Change-Id: Ieaebb24385f9d75eaad012043993dcfc733aa01a Signed-off-by: Scott Murray <scott.murray@konsulko.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29043 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.bbappend27
1 files changed, 0 insertions, 27 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 d3b27d155..5efe01045 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,29 +1,2 @@
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
- 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
-
- # 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 \
-"