X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Fkernel-module-mmngr%2Fkernel-module-mmngr.bbappend;h=1d602cd1669fd5e080b9690f90dc8975c91558ac;hb=57df0aefa1b7c80eb3f65cb2f5151937869cd102;hp=5262a9c5d732b0982756ffbb811d1e6621b15573;hpb=b6dc44f585b839ab1a2f0133b74958037fe1cb64;p=AGL%2Fmeta-agl.git

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 5262a9c5d..1d602cd16 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,2 +1,13 @@
-KERNEL_MODULE_AUTOLOAD_append = " mmngr"
+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
+}