Enable usrmerge

[AGL/meta-agl.git] / meta-agl-bsp / meta-rcar-gen3 / recipes-kernel / kernel-module-uvcs / kernel-module-uvcs-drv.bbappend

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 1fa00a8..a0ffc20 100644 (file)
--- 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
+}