[OE-core] [PATCH] bitbake.conf: add support for NFC into combined features

[Cristian Iorga]

if nfc feature is present in DISTRO_FEATURES and
in MACHINE_FEATURES, add it into COMBINED_FEATURES.

Partial fix for [YOCTO #7451].

Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
---
 meta/conf/bitbake.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 8653a7f..f028aa3 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -745,7 +745,8 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
-    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "nfc", d)}"
 COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
 
 SERIAL_CONSOLE ??= ""
-- 
2.1.4