From 6fdd26a72b923044351674f4172c85f160c6f301 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 5 Jul 2018 17:20:29 -0300 Subject: imx-test: Rework DEPENDS and VPU support All variants depends on `virtual/kernel`, `imx-lib` and `alsa-lib`, so this can be added by default. The VPU support has been moved to a `PACKAGECONFIG` so it adds the respective `make` parameter, and dependency, depending on the `MACHINEOVERRIDES` value. Signed-off-by: Otavio Salvador --- recipes-bsp/imx-test/imx-test_git.bb | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'recipes-bsp/imx-test') diff --git a/recipes-bsp/imx-test/imx-test_git.bb b/recipes-bsp/imx-test/imx-test_git.bb index 6e6971e5..0932d410 100644 --- a/recipes-bsp/imx-test/imx-test_git.bb +++ b/recipes-bsp/imx-test/imx-test_git.bb @@ -8,16 +8,7 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -DEPENDS_mx6q = "virtual/kernel imx-lib" -DEPENDS_mx6dl = "virtual/kernel imx-lib" -DEPENDS_mx6sl = "virtual/kernel imx-lib" -DEPENDS_mx6sll = "virtual/kernel imx-lib" -DEPENDS_mx6sx = "virtual/kernel imx-lib" -DEPENDS_mx6ul = "virtual/kernel imx-lib" -DEPENDS_mx7d = "virtual/kernel imx-lib" -DEPENDS_mx7ulp = "virtual/kernel imx-lib" -DEPENDS_append_imxvpu = " virtual/imxvpu" -DEPENDS_append = " alsa-lib" +DEPENDS = "virtual/kernel imx-lib alsa-lib" PE = "1" PV = "7.0+${SRCPV}" @@ -46,14 +37,14 @@ PLATFORM_mx6ul = "IMX6UL" PLATFORM_mx7d = "IMX7D" PLATFORM_mx7ulp = "IMX7D" -PARALLEL_MAKE="-j 1" +PARALLEL_MAKE = "-j 1" +EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" -IMX_HAS_VPU = "false" -IMX_HAS_VPU_imxvpu = "true" -EXTRA_OEMAKE += "HAS_VPU=${IMX_HAS_VPU}" +PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG_append_imxvpu = " vpu" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr" +PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu" do_compile() { CFLAGS="${TOOLCHAIN_OPTIONS}" -- cgit v1.2.3-54-g00ecf