[meta-ti] [PATCH] omap3-sgx-modules: Install via the kernel's "modules_install" target.
Denys Dmytriyenko
denys at ti.com
Mon Mar 30 07:09:15 PDT 2015
On Mon, Mar 30, 2015 at 07:41:49AM -0400, Jacob Stiffler wrote:
> * This allows the modules to have a consistent installation structure
> when directly building from source.
> * Previously, these modules would be manualy installed to appears as
> in-tree modules.
>
> Signed-off-by: Jacob Stiffler <j-stiffler at ti.com>
> ---
> .../omap3-sgx-modules_4.05.00.03.bb | 13 ++-----------
> .../omap3-sgx-modules_4.09.00.01.bb | 13 ++-----------
> .../omap3-sgx-modules_5.01.01.01.bb | 14 ++------------
> .../omap3-sgx-modules_5.01.01.02.bb | 14 ++------------
> 4 files changed, 8 insertions(+), 46 deletions(-)
>
> diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb
> index bd476f0..a54a643 100644
> --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb
> +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.05.00.03.bb
> @@ -10,7 +10,7 @@ BINFILE := "Graphics_SDK_setuplinux_${SGXPV}.bin"
>
> inherit module
>
> -MACHINE_KERNEL_PR_append = "b"
> +MACHINE_KERNEL_PR_append = "c"
> PR = "${MACHINE_KERNEL_PR}"
>
> DEFAULT_PREFERENCE_omap3 = "99"
> @@ -32,17 +32,8 @@ TI_PLATFORM_ti814x = "ti81xx"
> TI_PLATFORM_ti816x = "ti81xx"
> TI_PLATFORM_ti33x = "ti335x"
>
> -MODULESLOCATION_omap3 = "dc_omapfb3_linux"
> -MODULESLOCATION_ti814x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti816x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti33x = "dc_ti335x_linux"
> -
> MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM}"
>
> do_install() {
> - mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> - cp ${S}/pvrsrvkm.ko \
> - ${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko \
> - ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
> - ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> + make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
If you want the standard module installation, then move any additional
variables to EXTRA_OEMAKE and drop do_install completely.
> }
> diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
> index 4b97bbc..cd6dbe4 100644
> --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
> +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_4.09.00.01.bb
> @@ -10,7 +10,7 @@ IMGPV = "1.9.2188537"
>
> inherit module
>
> -MACHINE_KERNEL_PR_append = "c"
> +MACHINE_KERNEL_PR_append = "d"
> PR = "${MACHINE_KERNEL_PR}"
>
> DEFAULT_PREFERENCE = "-1"
> @@ -44,19 +44,10 @@ TI_PLATFORM_ti814x = "ti81xx"
> TI_PLATFORM_ti816x = "ti81xx"
> TI_PLATFORM_ti33x = "ti335x"
>
> -MODULESLOCATION_omap3 = "dc_omapfb3_linux"
> -MODULESLOCATION_ti814x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti816x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti33x = "dc_ti335x_linux"
> -
> MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=0"
>
> MAKE_TARGETS_append_ti33x = " PM_RUNTIME=1"
>
> do_install() {
> - mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> - cp ${S}/pvrsrvkm.ko \
> - ${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko \
> - ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
> - ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> + make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
> }
> diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb
> index a1d95bf..1ac60da 100644
> --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb
> +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.01.bb
> @@ -10,7 +10,7 @@ IMGPV = "1.10.2359475"
>
> inherit module
>
> -MACHINE_KERNEL_PR_append = "c"
> +MACHINE_KERNEL_PR_append = "d"
> PR = "${MACHINE_KERNEL_PR}"
>
> BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"
> @@ -55,18 +55,8 @@ TI_PLATFORM_ti816x = "ti81xx"
> TI_PLATFORM_ti33x = "ti335x"
> TI_PLATFORM_ti43x = "ti43xx"
>
> -MODULESLOCATION_omap3 = "dc_omapfb3_linux"
> -MODULESLOCATION_ti814x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti816x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti33x = "dc_ti335x_linux"
> -MODULESLOCATION_ti43x = "dc_ti43xx_linux"
> -
> MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
>
> do_install() {
> - mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> - cp ${S}/pvrsrvkm.ko \
> - ${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko \
> - ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
> - ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> + make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
> }
> diff --git a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb
> index 6a07d4f..cf042fc 100644
> --- a/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb
> +++ b/recipes-bsp/powervr-drivers/omap3-sgx-modules_5.01.01.02.bb
> @@ -10,7 +10,7 @@ IMGPV = "1.10.2359475"
>
> inherit module
>
> -MACHINE_KERNEL_PR_append = "a"
> +MACHINE_KERNEL_PR_append = "b"
> PR = "${MACHINE_KERNEL_PR}"
>
> BINFILE_HARDFP = "Graphics_SDK_setuplinux_hardfp_${SGXPV}.bin"
> @@ -51,18 +51,8 @@ TI_PLATFORM_ti816x = "ti81xx"
> TI_PLATFORM_ti33x = "ti335x"
> TI_PLATFORM_ti43x = "ti43xx"
>
> -MODULESLOCATION_omap3 = "dc_omapfb3_linux"
> -MODULESLOCATION_ti814x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti816x = "dc_ti81xx_linux"
> -MODULESLOCATION_ti33x = "dc_ti335x_linux"
> -MODULESLOCATION_ti43x = "dc_ti43xx_linux"
> -
> MAKE_TARGETS = " BUILD=${PVRBUILD} TI_PLATFORM=${TI_PLATFORM} SUPPORT_XORG=${SUPPORT_XORG}"
>
> do_install() {
> - mkdir -p ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> - cp ${S}/pvrsrvkm.ko \
> - ${S}/services4/3rdparty/${MODULESLOCATION}/omaplfb.ko \
> - ${S}/services4/3rdparty/bufferclass_ti/bufferclass_ti.ko \
> - ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/gpu/pvr
> + make -C ${STAGING_KERNEL_DIR} SUBDIRS=${B} INSTALL_MOD_PATH=${D} PREFIX=${STAGING_DIR_HOST} modules_install
> }
> --
> 1.7.9.5
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
More information about the meta-ti
mailing list