From 719941576c5b957c06b1f3dfc89173cdc466721d Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Fri, 5 Jan 2018 13:42:50 +0700 Subject: rcar-gen3: kernel-module: Set KERNEL_MODULE_PACKAGE_SUFFIX to fix building kernel modules From YP2.3 [1], kernel module packages are now suffixed with the kernel version in order to allow module packages from multiple kernel versions to co-exist on a target system. We can return to the previous naming scheme that does not include the version suffix by setting KERNEL_MODULE_PACKAGE_SUFFIX to blank to build modules without suffix. [1] http://www.yoctoproject.org/docs/2.3/ref-manual/ref-manual.html#migration-2.3-miscellaneous-changes Signed-off-by: Thuy Tran Signed-off-by: Takamitsu Honda --- .../recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb | 3 +++ .../recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb | 3 +++ .../recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb | 3 +++ .../recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb | 3 +++ .../recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb | 3 +++ meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb | 3 +++ .../recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb | 3 +++ meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb | 3 +++ meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bb | 3 +++ .../kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb | 3 +++ .../recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb | 3 +++ .../recipes-kernel/kernel-module-mmngr/kernel-module-mmngr.bb | 3 +++ .../recipes-kernel/kernel-module-mmngr/kernel-module-mmngrbuf.bb | 3 +++ meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb | 3 +++ .../recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb | 3 +++ .../kernel-module-vsp2driver/kernel-module-vsp2driver.bb | 3 +++ meta-rcar-gen3/recipes-kernel/kernel-module-vspm/kernel-module-vspm.bb | 3 +++ .../recipes-kernel/kernel-module-vspmif/kernel-module-vspmif.bb | 3 +++ 18 files changed, 54 insertions(+) diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb index 35fde0f..a80b5e5 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb @@ -18,6 +18,9 @@ S = "${WORKDIR}/RCG3AHPDL4101ZDO" # Define the extra config for using module.bbclass to build ADSP driver EXTRA_OEMAKE_append = " KDIR=${STAGING_KERNEL_DIR}" +# Build ADSP kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install_append(){ # Create install directories install -d ${D}/${includedir} diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb index fb0e4cd..8c82744 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb @@ -22,6 +22,9 @@ S = "${WORKDIR}/git" includedir = "${RENESAS_DATADIR}/include" +# Build AVB MCH kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install_append() { # Create destination directories install -d ${KERNELSRC}/include diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb index dd05678..2dd871c 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb @@ -22,6 +22,9 @@ S = "${WORKDIR}/git" includedir = "${RENESAS_DATADIR}/include" +# Build AVB MSE kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install_append() { # Create destination directories install -d ${KERNELSRC}/include diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb index e888455..e7d92a4 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb @@ -22,6 +22,9 @@ S = "${WORKDIR}/git" includedir="${RENESAS_DATADIR}/include" +# Build AVB Streaming kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install_append () { # Create destination directories install -d ${KERNELSRC}/include diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb index ee926d3..42f4f85 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb @@ -25,6 +25,9 @@ EXTRA_OEMAKE_r8a7795 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_H3" EXTRA_OEMAKE_r8a7796 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3" EXTRA_OEMAKE_r8a77965 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3N" +# Build DTV kernel modules without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/scu_src_drv/drv oe_runmake diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb index 033b8aa..4b1408e 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb @@ -25,6 +25,9 @@ EXTRA_OEMAKE_r8a7795 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_H3" EXTRA_OEMAKE_r8a7796 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3" EXTRA_OEMAKE_r8a77965 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3N" +# Build DTV SSP kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/ssp_drv/drv oe_runmake diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb index 9b3d93d..55c5690 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb @@ -25,6 +25,9 @@ EXTRA_OEMAKE_r8a7795 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_H3" EXTRA_OEMAKE_r8a7796 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3" EXTRA_OEMAKE_r8a77965 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3N" +# Build DTV tddmac kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/tddmac_drv/drv oe_runmake diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb index f24701c..a31f9c0 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb @@ -24,6 +24,9 @@ EXTRA_OEMAKE_r8a7795 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_H3" EXTRA_OEMAKE_r8a7796 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3" EXTRA_OEMAKE_r8a77965 += "DTV_MAKE_HW_SWITCH=HW_SUPPORT_M3N" +# Build DTV tsif kernel module withou suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/tsif_drv/drv oe_runmake 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 b2a1274..8dea6a3 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 @@ -29,6 +29,9 @@ B = "${KBUILD_DIR}" EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR}" EXTRA_OEMAKE += "CROSS_COMPILE=${CROSS_COMPILE}" +# Build GFX kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + module_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS cd ${KBUILD_DIR} diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb index c088e0f..3a36b22 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb @@ -19,6 +19,9 @@ SRC_URI = "file://iccom-hwspinlock-sample.tar.bz2" S = "${WORKDIR}/iccom-hwspinlock-sample" B = "${S}/iccom-hwspinlock-sample" +# Build ICCOM kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install () { # Create destination directory install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb index b2132ad..ef38f56 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb @@ -19,6 +19,9 @@ SRC_URI = "file://iccom-mfis.tar.bz2" S = "${WORKDIR}/iccom-mfis" B = "${S}/iccom-mfis/drv" +# Build ICCOM MFIS kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install () { # Create destination directory install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ 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 766852e..9f804c1 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 @@ -17,6 +17,9 @@ MMNGR_CFG_m3ulcb = "MMNGR_SALVATORX" includedir="${RENESAS_DATADIR}/include" SSTATE_DUPWHITELIST += "${STAGING_INCDIR}" +# Build Memory Manger kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { export MMNGR_CONFIG=${MMNGR_CFG} 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 4f61ee6..a3f45ca 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 @@ -12,6 +12,9 @@ MMNGRBUF_DRV_DIR = "mmngr_drv/mmngrbuf/mmngrbuf-module/files/mmngrbuf" includedir="${RENESAS_DATADIR}/include" SSTATE_DUPWHITELIST += "${STAGING_INCDIR}" +# Build Memory Manager Buffer kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/${MMNGRBUF_DRV_DIR}/drv install -d ${INCSHARED} diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb index 7c5bb98..3003a9b 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-qos/kernel-module-qos.bb @@ -25,6 +25,9 @@ QOS_DRV_DIR = "qos-module/files/qos/drv" includedir = "${RENESAS_DATADIR}/include" +# Build Qos kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/${QOS_DRV_DIR}/ oe_runmake 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 eb2990a..7fbc430 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 @@ -34,6 +34,9 @@ do_compile_prepend() { export VCP4_SRC="${S}/src" } +# Build UVCS kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_install() { # Create destination directory install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ 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 174f6ee..2bd66aa 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 @@ -23,6 +23,9 @@ SRC_URI = "${VSP2DRIVER_URL};branch=${BRANCH}" S = "${WORKDIR}/git" +# Build VSP2 driver kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/vsp2driver make all 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 996a0e4..97e703c 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 @@ -24,6 +24,9 @@ S = "${WORKDIR}/git" VSPM_DRV_DIR = "vspm-module/files/vspm" includedir = "${RENESAS_DATADIR}/include" +# Build VSP Manager kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/${VSPM_DRV_DIR}/drv make all 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 32cfed2..8dd6513 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 @@ -26,6 +26,9 @@ VSPMIF_DRV_DIR = "vspm_if-module/files/vspm_if" includedir = "${RENESAS_DATADIR}/include" +# Build VSP Manager Interface kernel module without suffix +KERNEL_MODULE_PACKAGE_SUFFIX = "" + do_compile() { cd ${S}/${VSPMIF_DRV_DIR}/drv make all -- cgit 1.2.3-korg