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=4273c005121831593f4d0572604b71d5b5f25483;hp=13163e495add677034907d75b1c85625b04d6b7e;hpb=7ead5627644191f1c280002c857a2d8a19fc8114;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 13163e495..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 +1,13 @@
-KERNEL_MODULE_AUTOLOAD = "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
+}