From: Matt Porter Date: Mon, 1 Apr 2019 16:50:34 +0000 (-0400) Subject: busybox: fix CONFIG_RFKILL enable logic X-Git-Tag: 2019-04~115 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=5e6d7760c599b09b9417aa8d044084f4c5123762;p=openembedded-core.git busybox: fix CONFIG_RFKILL enable logic Currently CONFIG_RFKILL is enabled only if both bluetooth *and* wifi distro features are present. It should be enabled when either feature is present. Fix this by switching to use of bb.utils.contains_any(). Signed-off-by: Matt Porter Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 24c15e4aee..c9d25ff1ca 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -75,8 +75,7 @@ def features_to_busybox_settings(d): busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) - busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) + busybox_cfg(bb.utils.contains_any('DISTRO_FEATURES', 'bluetooth wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) return "\n".join(cnf), "\n".join(rem) # X, Y = ${@features_to_busybox_settings(d)}