From 71c2baf7766d066380cef5b8de46ab0d866a5171 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Wed, 17 Mar 2010 14:09:47 -0400 Subject: ti-dvsdk-demos: rework the build and install, update the version Signed-off-by: Denys Dmytriyenko Signed-off-by: Koen Kooi --- recipes/ti/ti-dvsdk-demos.inc | 50 ++++++++++++++++++++++++--------- recipes/ti/ti-dvsdk-demos_3.10.00.00.bb | 3 -- recipes/ti/ti-dvsdk-demos_3.10.00.09.bb | 11 -------- recipes/ti/ti-dvsdk-demos_3.10.00.11.bb | 7 +++++ 4 files changed, 44 insertions(+), 27 deletions(-) delete mode 100644 recipes/ti/ti-dvsdk-demos_3.10.00.00.bb delete mode 100644 recipes/ti/ti-dvsdk-demos_3.10.00.09.bb create mode 100644 recipes/ti/ti-dvsdk-demos_3.10.00.11.bb diff --git a/recipes/ti/ti-dvsdk-demos.inc b/recipes/ti/ti-dvsdk-demos.inc index 5b97efa0fa..91d5e786ba 100644 --- a/recipes/ti/ti-dvsdk-demos.inc +++ b/recipes/ti/ti-dvsdk-demos.inc @@ -2,6 +2,8 @@ DESCRIPTION = "DVSDK Demo applications for TI ARM/DSP processors" SECTION = "multimedia" LICENSE = "TI" +INC_PR = "r1" + DEPENDS += "ti-dmai" DEPENDS += "alsa-lib libpng freetype jpeg" @@ -9,25 +11,48 @@ SRC_URI = "${BASE_SRC_URI}/dvsdk_demos_${PV}.tar.gz;name=dvsdkdemostarball" S = "${WORKDIR}/dvsdk_demos_${PV}" -inherit module-base require ti-multimedia-common.inc -# Should go into machine config -TARGET ?= "all" -TARGET_dm355 ?= "dm355" -TARGET_dm365 ?= "dm365" -TARGET_dm6467 ?= "dm6467" +DEMOSPLATFORM_dm355 = "dm355" +DEMOSPLATFORM_dm365 = "dm365" +DEMOSPLATFORM_dm6446 = "dm6446" +DEMOSPLATFORM_dm6467 = "dm6467" +DEMOSPLATFORM_omap3 = "omap3530" +DEMOSPLATFORM_omapl137 = "ol137" +DEMOSPLATFORM_omapl138 = "ol138" -VERBOSE = "true" +do_configure_prepend() { + sed -i -e 's:INSTALLSUBDIRS = $(addsuffix .install, $(SUBDIRS)):INSTALLSUBDIRS = $(addsuffix .install, $(PLATFORM)):g' ${S}/Makefile +} do_compile () { - cd ${S} - make -e clean - make -e ${TARGET} + cd ${S} + make -e clean + make -e PLATFORM=${DEMOSPLATFORM} \ + VERBOSE="true" \ + DMAI_INSTALL_DIR="${DMAI_INSTALL_DIR}" \ + XDC_INSTALL_DIR="${XDC_INSTALL_DIR}" \ + CE_INSTALL_DIR="${CE_INSTALL_DIR}" \ + FC_INSTALL_DIR="${FC_INSTALL_DIR}" \ + CODEC_INSTALL_DIR="${CODEC_INSTALL_DIR}" \ + CODEGEN_INSTALL_DIR="${CODEGEN_INSTALL_DIR}" \ + BIOS_INSTALL_DIR="${BIOS_INSTALL_DIR}"\ + CROSS_COMPILE="${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}" \ + XDAIS_INSTALL_DIR="${XDAIS_INSTALL_DIR}" \ + LINK_INSTALL_DIR="${LINK_INSTALL_DIR}" \ + CMEM_INSTALL_DIR="${CMEM_INSTALL_DIR}" \ + LPM_INSTALL_DIR="${LPM_INSTALL_DIR}" \ + LINUXKERNEL_INSTALL_DIR="${STAGING_KERNEL_DIR}" \ + LINUXLIBS_INSTALL_DIR="${STAGING_DIR_TARGET}/usr" \ + MVTOOL_DIR="${TOOLCHAIN_PATH}" \ + ${DEMOSPLATFORM} } + do_install () { - cd ${S} - make -e ${TARGET} EXEC_DIR=${D}/${installdir}/dvsdk-demos install + cd ${S} + make -e EXEC_DIR=${D}/${installdir}/dvsdk-demos \ + PLATFORM=${DEMOSPLATFORM} \ + install } PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -37,7 +62,6 @@ RDEPENDS_ti-dvsdk-demos_dm365 += "ti-dm365mm-module ti-cmem-module alsa-lib libp FILES_${PN} = "${installdir}/dvsdk-demos/*" - BASE_SRC_URI ?= "http://install.source.dir.local" INHIBIT_PACKAGE_STRIP = "1" diff --git a/recipes/ti/ti-dvsdk-demos_3.10.00.00.bb b/recipes/ti/ti-dvsdk-demos_3.10.00.00.bb deleted file mode 100644 index 1fbcf6f55a..0000000000 --- a/recipes/ti/ti-dvsdk-demos_3.10.00.00.bb +++ /dev/null @@ -1,3 +0,0 @@ -require ti-dvsdk-demos.inc - -PV = "3_10_00_00" diff --git a/recipes/ti/ti-dvsdk-demos_3.10.00.09.bb b/recipes/ti/ti-dvsdk-demos_3.10.00.09.bb deleted file mode 100644 index 8aca3b8d88..0000000000 --- a/recipes/ti/ti-dvsdk-demos_3.10.00.09.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ti-dvsdk-demos.inc - -PV = "3_10_00_09" - -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_dm355 = "1" -DEFAULT_PREFERENCE_dm365 = "1" -DEFAULT_PREFERENCE_dm6467 = "1" - -SRC_URI[dvsdkdemostarball.md5sum] = "ef4c4e9b4dde03342ab5305e5e6ea871" -SRC_URI[dvsdkdemostarball.sha256sum] = "f2b5a16f618f0fdc778f3df4148feba74a7ecea54318739f885671fa5be8b2b8" diff --git a/recipes/ti/ti-dvsdk-demos_3.10.00.11.bb b/recipes/ti/ti-dvsdk-demos_3.10.00.11.bb new file mode 100644 index 0000000000..6fb35aabe3 --- /dev/null +++ b/recipes/ti/ti-dvsdk-demos_3.10.00.11.bb @@ -0,0 +1,7 @@ +require ti-dvsdk-demos.inc + +PV = "3_10_00_11" +PR = "${INC_PR}.0" + +SRC_URI[dvsdkdemostarball.md5sum] = "7e92c559c9240fadc9efeb12eb99d85e" +SRC_URI[dvsdkdemostarball.sha256sum] = "6fe7d93db4239a439758829c1fecfe31546733f4895acc5019bb834d77166c00" -- cgit 1.2.3-korg