diff options
| author | Matt Porter <mporter@konsulko.com> | 2019-04-01 12:50:34 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-02 15:24:11 +0100 |
| commit | 24fbb31bc728d65d4ddde2555034dc85181fd228 (patch) | |
| tree | e32c10c3a4b05a029c9c69bbac50a3f517e8897a | |
| parent | 9dec37ceef6c1db79e33484cf983629c6601f802 (diff) | |
| download | poky-24fbb31bc728d65d4ddde2555034dc85181fd228.tar.gz | |
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().
(From OE-Core rev: 5e6d7760c599b09b9417aa8d044084f4c5123762)
Signed-off-by: Matt Porter <mporter@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 3 |
1 files changed, 1 insertions, 2 deletions
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): | |||
| 75 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) | 75 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) |
| 76 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) | 76 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) |
| 77 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) | 77 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) |
| 78 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) | 78 | busybox_cfg(bb.utils.contains_any('DISTRO_FEATURES', 'bluetooth wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) |
| 79 | busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) | ||
| 80 | return "\n".join(cnf), "\n".join(rem) | 79 | return "\n".join(cnf), "\n".join(rem) |
| 81 | 80 | ||
| 82 | # X, Y = ${@features_to_busybox_settings(d)} | 81 | # X, Y = ${@features_to_busybox_settings(d)} |