X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Fkernel-module-uvcs%2Fkernel-module-uvcs-drv.bbappend;fp=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Fkernel-module-uvcs%2Fkernel-module-uvcs-drv.bbappend;h=a0ffc20ced0548137dce8f9a15e21952ad616554;hb=4f5cf5dc8de803407fa9d3ffa13994309edde985;hp=1fa00a859c9c10d35f22920faa08ac20359edfc5;hpb=080086bc5062a1eb025b82051884aaa508f50408;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
index 1fa00a859..a0ffc20ce 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bbappend
@@ -1,3 +1,12 @@
 require checksum_control.inc
 
 KERNEL_MODULE_AUTOLOAD = "uvcs_drv"
+
+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
+}