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;fp=meta-agl-bsp%2Fmeta-rcar-gen3%2Frecipes-kernel%2Fkernel-module-gles%2Fkernel-module-gles.bbappend;h=b8882ae498cf2d8ab538b36469e12f19bfe7dac0;hb=adabd19ec49fef0e39ec33b0887a1bec5fad94a0;hp=a4363bf88883102a37af5729ea05bfc0136dda21;hpb=599ca3f2c22720d7154dfc371c573b8c602f7969;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 a4363bf88..b8882ae49 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
@@ -4,20 +4,3 @@ module_do_compile:prepend() {
     cd ${S}/build/linux/config/compilers
     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"