aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-bsp
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-04-11 09:38:49 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-11 09:38:49 -0300
commit370a313c750d3a7d7171523a6d5fe66de45e931d (patch)
tree5d3324742308d735cac7ca4e431814ff51144748 /recipes-bsp
parent1a5c169afbdb936f2339c988fb1efccf8c95257e (diff)
downloadmeta-fsl-arm-370a313c750d3a7d7171523a6d5fe66de45e931d.tar.gz
meta-fsl-arm-370a313c750d3a7d7171523a6d5fe66de45e931d.tar.bz2
meta-fsl-arm-370a313c750d3a7d7171523a6d5fe66de45e931d.zip
imx-test: Fix build for X11 backend
The root case of the addition of the dependencies on the recipe was that it were not being correctly included in the .inc file. This fixes it and remove the duplication. Change-Id: Ie9ee5fbc2a61915ce109473f5df2b8e88d3966c4 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/imx-test/imx-test.inc7
-rw-r--r--recipes-bsp/imx-test/imx-test_5.4.bb13
2 files changed, 3 insertions, 17 deletions
diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index 3c463c7..1fcb632 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -11,10 +11,6 @@ DEPENDS_mx6sx = "virtual/kernel imx-lib"
DEPENDS_mx6ul = "virtual/kernel imx-lib"
DEPENDS_mx7 = "virtual/kernel imx-lib"
-DEPENDS_append = " \
- ${@base_contains('DISTRO_FEATURES', 'x11', 'libx11 libxdamage libxrender libxrandr', '', d)} \
-"
-
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
@@ -33,6 +29,9 @@ PLATFORM_mx6sx = "IMX6SX"
PLATFORM_mx7 = "IMX7D"
PLATFORM_mx6ul = "IMX6UL"
+PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
+
# Required so the fixdep binary is generated
addtask make_scripts after do_patch before do_compile
do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
diff --git a/recipes-bsp/imx-test/imx-test_5.4.bb b/recipes-bsp/imx-test/imx-test_5.4.bb
index de4e5ba..6a12c05 100644
--- a/recipes-bsp/imx-test/imx-test_5.4.bb
+++ b/recipes-bsp/imx-test/imx-test_5.4.bb
@@ -2,19 +2,6 @@
include imx-test.inc
-DEPENDS_mx6q += "${@base_contains('DISTRO_FEATURES', 'x11', \
- ' libx11 libxdamage libxrender libxrandr', '', d)}"
-DEPENDS_mx6dl += "${@base_contains('DISTRO_FEATURES', 'x11', \
- ' libx11 libxdamage libxrender libxrandr', '', d)}"
-DEPENDS_mx6sl += "${@base_contains('DISTRO_FEATURES', 'x11', \
- ' libx11 libxdamage libxrender libxrandr', '', d)}"
-DEPENDS_mx6sx += "${@base_contains('DISTRO_FEATURES', 'x11', \
- ' libx11 libxdamage libxrender libxrandr', '', d)}"
-DEPENDS_mx6ul += "${@base_contains('DISTRO_FEATURES', 'x11', \
- ' libx11 libxdamage libxrender libxrandr', '', d)}"
-DEPENDS_mx7d += "${@base_contains('DISTRO_FEATURES', 'x11', \
- ' libx11 libxdamage libxrender libxrandr', '', d)}"
-
SRC_URI[md5sum] = "46ddd6d1631cc0f7328383e13632d5bb"
SRC_URI[sha256sum] = "cae6ec9b4d5cc1c402a7683cc8c2c35cccdd9598283caefcea2804baa47a15b6"