meta-agl-bsp: remove now unnecessary workarounds

[AGL/meta-agl.git] / meta-agl-bsp / meta-rcar-gen3 / recipes-kernel / kernel-module-vspmif / kernel-module-vspm-if.bbappend

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 d3b27d1..5efe010 100644 (file)
--- 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 \
-"