From 518ccf11acee2184a5a32590b1cf3b37a85dbe9d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 9 Feb 2018 17:43:53 +0100 Subject: [PATCH] imx: install 'imx-alsa-plugins' depending on alsa distro feature This is how it's done for the NXP reference boards in 'meta-freescale' Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccimx6.inc | 9 +++++++-- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index a5c4bdd9f..879436413 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -26,7 +26,12 @@ MACHINE_EXTRA_RDEPENDS += " \ parted \ u-boot-fw-utils \ " -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" -MACHINE_EXTRA_RRECOMMENDS += "imx-alsa-plugins cryptodev-module" + +MACHINE_EXTRA_RRECOMMENDS += " \ + ${MACHINE_FIRMWARE} \ + ${WIRELESS_MODULE} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)} \ + cryptodev-module \ +" MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 30691e816..5aa20f5ce 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -28,8 +28,14 @@ MACHINE_EXTRA_RDEPENDS += " \ mtd-utils-ubifs \ u-boot-fw-utils \ " -MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" -MACHINE_EXTRA_RRECOMMENDS += "imx-alsa-plugins cryptodev-module cryptoauthlib" + +MACHINE_EXTRA_RRECOMMENDS += " \ + ${MACHINE_FIRMWARE} \ + ${WIRELESS_MODULE} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'imx-alsa-plugins', '', d)} \ + cryptoauthlib \ + cryptodev-module \ +" MACHINE_FEATURES += "wifi bluetooth"