busybox: fix missing features due to lack of variable expansion

Expand DISTRO_FEATURES and MACHINE_FEATURES fully so that any inner
variable references (such as DISTRO_FEATURES_LIBC) are expanded properly.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 1334d069645dad62ea0585571d088f0fd6e778ff..c51cf6a124d7cb58530217cc34dca22ba5c0b68f 100644 (file)
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -47,8 +47,8 @@ def busybox_cfg(feature, features, tokens, cnf, rem):
 # Map distro and machine features to config settings
 def features_to_busybox_settings(d):
        cnf, rem = ([], [])
-       distro_features = bb.data.getVar('DISTRO_FEATURES', d).split()
-       machine_features = bb.data.getVar('MACHINE_FEATURES', d).split()
+       distro_features = bb.data.getVar('DISTRO_FEATURES', d, True).split()
+       machine_features = bb.data.getVar('MACHINE_FEATURES', d, True).split()
        busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem)
        busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem)
        busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)

diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index 5883cc65cf3c804104cecba7ae0729a6fb1a1a73..9d3d5b138e5c7d7751348189bd73e23de197bf2c 100644 (file)
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \