diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb index 249a057..8190620 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb @@ -48,9 +48,9 @@ module_do_compile() { module_do_install() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS - install -d ${D}/lib/modules/${KERNEL_VERSION} + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION} cd ${KBUILD_DIR} - oe_runmake DISCIMAGE="${D}" install + oe_runmake DISCIMAGE="${D}/${prefix}" install } # Ship the module symbol file to kernel build dir @@ -68,7 +68,7 @@ module_clean_symbol() { } FILES_${PN} = " \ - /lib/modules/${KERNEL_VERSION}/extra/pvrsrvkm.ko \ + ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/pvrsrvkm.ko \ ${sysconfdir}/modules-load.d \ " diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb index 694163e..c450255 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb @@ -40,7 +40,7 @@ do_compile() { do_install () { # Create destination directories - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ install -d ${KERNELSRC}/include install -d ${D}/${includedir} @@ -49,7 +49,7 @@ do_install () { install -m 644 ${S}/${MMNGR_DRV_DIR}/drv/Module.symvers ${KERNELSRC}/include/mmngr.symvers # Install kernel module - install -m 644 ${S}/${MMNGR_DRV_DIR}/drv/mmngr.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -m 644 ${S}/${MMNGR_DRV_DIR}/drv/mmngr.ko ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ # Install shared header files to KERNELSRC(STAGING_KERNEL_DIR) # This file installed in SDK by kernel-devsrc pkg. @@ -69,7 +69,7 @@ PACKAGES = "\ " FILES_${PN} = " \ - /lib/modules/${KERNEL_VERSION}/extra/mmngr.ko \ + ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/mmngr.ko \ " RPROVIDES_${PN} += "kernel-module-mmngr" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb index 6a2fb8d..28857bc 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb @@ -28,7 +28,7 @@ do_compile() { do_install () { # Create destination directories - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ install -d ${KERNELSRC}/include install -d ${D}/${includedir} @@ -37,7 +37,7 @@ do_install () { install -m 644 ${S}/${MMNGRBUF_DRV_DIR}/drv/Module.symvers ${KERNELSRC}/include/mmngrbuf.symvers # Install kernel module - install -m 644 ${S}/${MMNGRBUF_DRV_DIR}/drv/mmngrbuf.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -m 644 ${S}/${MMNGRBUF_DRV_DIR}/drv/mmngrbuf.ko ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ # Install shared header files to KERNELSRC(STAGING_KERNEL_DIR) # This file installed in SDK by kernel-devsrc pkg. diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb index bb32641..92700f4 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb @@ -40,11 +40,11 @@ KERNEL_MODULE_PACKAGE_SUFFIX = "" do_install() { # Create destination directory - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ install -d ${D}/${includedir}/ # Install kernel module - install -m 644 ${B}/uvcs_drv.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -m 644 ${B}/uvcs_drv.ko ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ # Install module symbol file install -m 644 ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/UVCS.symvers diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bb index be8f8e0..7a6b103 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vsp2driver/kernel-module-vsp2driver.bb @@ -35,7 +35,7 @@ do_compile() { do_install () { # Create destination directories - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ install -d ${KERNELSRC}/include # Install shared library to KERNELSRC(STAGING_KERNEL_DIR) for reference from other modules @@ -43,7 +43,7 @@ do_install () { install -m 644 ${S}/vsp2driver/Module.symvers ${KERNELSRC}/include/vsp2.symvers # Copy kernel module - install -m 644 ${S}/vsp2driver/vsp2.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -m 644 ${S}/vsp2driver/vsp2.ko ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ # Install shared header files to KERNELSRC(STAGING_KERNEL_DIR) # This file installed in SDK by kernel-devsrc pkg. @@ -55,7 +55,7 @@ PACKAGES = "\ " FILES_${PN} = " \ - /lib/modules/${KERNEL_VERSION}/extra/vsp2.ko \ + ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/vsp2.ko \ ${sysconfdir}/modules-load.d \ " diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb index 9b72361..c1f0e67 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb @@ -39,7 +39,7 @@ do_compile() { do_install () { # Create destination directories - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ install -d ${KERNELSRC}/include install -d ${D}/${includedir} @@ -48,7 +48,7 @@ do_install () { install -m 644 ${S}/${VSPM_DRV_DIR}/drv/Module.symvers ${KERNELSRC}/include/vspm.symvers # Install kernel module - install -m 644 ${S}/${VSPM_DRV_DIR}/drv/vspm.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -m 644 ${S}/${VSPM_DRV_DIR}/drv/vspm.ko ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ # Install shared header files to KERNELSRC(STAGING_KERNEL_DIR) # This file installed in SDK by kernel-devsrc pkg. @@ -93,7 +93,7 @@ PACKAGES = " \ " FILES_${PN} = " \ - /lib/modules/${KERNEL_VERSION}/extra/vspm.ko \ + ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/vspm.ko \ " RPROVIDES_${PN} += "kernel-module-vspm" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb index 95e71c4..83a55df 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb @@ -36,7 +36,7 @@ do_compile() { do_install () { # Create destination directories - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -d ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ install -d ${D}/${includedir} install -d ${KERNELSRC}/include @@ -45,7 +45,7 @@ do_install () { install -m 644 ${S}/${VSPMIF_DRV_DIR}/drv/Module.symvers ${KERNELSRC}/include/vspm_if.symvers # Install kernel module - install -m 644 ${S}/${VSPMIF_DRV_DIR}/drv/vspm_if.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ + install -m 644 ${S}/${VSPMIF_DRV_DIR}/drv/vspm_if.ko ${D}/${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/ # Install shared header files to KERNELSRC(STAGING_KERNEL_DIR) # This file installed in SDK by kernel-devsrc pkg. @@ -61,7 +61,7 @@ PACKAGES = "\ " FILES_${PN} = " \ - /lib/modules/${KERNEL_VERSION}/extra/vspm_if.ko \ + ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/vspm_if.ko \ " RPROVIDES_${PN} += "kernel-module-vspmif kernel-module-vspm-if"