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>

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 3c463c75..1fcb632c 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 de4e5bad..6a12c055 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"