X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Fkernel-module-gles%2Fkernel-module-gles.bbappend;h=a4363bf88883102a37af5729ea05bfc0136dda21;hb=4273c005121831593f4d0572604b71d5b5f25483;hp=8a4176fc11be0efcf390be79c3b961ffa94ca335;hpb=9a6b28c8ec3171e2c6852cf73f3f07ecd056c4a1;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
index 8a4176fc1..a4363bf88 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend
@@ -1,4 +1,23 @@
-module_do_compile_prepend() {
+require checksum_control.inc
+
+module_do_compile:prepend() {
     cd ${S}/build/linux/config/compilers
-    cp aarch64-poky-linux.mk ${TARGET_SYS}.mk
+    cp aarch64-linux-gnu.mk ${TARGET_SYS}.mk
 }
+
+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
+}
+
+# Required to guarantee the module goes into the expected
+# kernel-module-gles package and doesn't end up packaged in
+# kernel-module-pvrsvkm by the default behavior.  Can be removed
+# if upstream correctly use ${nonarch_base_libdir} themselves.
+FILES:${PN} += "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/pvrsrvkm.ko"