busybox: fix missing features due to lack of variable expansion
cover busybox: fix missing features due to lack of variable expansion
This fixes the issue with ipv4/ipv6 features not being enabled in busybox (which Gary Thomas pointed out on the poky mailing list.)
The following change since commit e66c2999afa2b3efbce8bb46c89f9db5e15f35c7:
libx11: ensure nativesdk uses correct DEPENDS and XCB flags (2011-07-10 09:49:06 +0100)
is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/busybox-features-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/busybox-features-fix
Paul Eggleton (1):
busybox: fix missing features due to lack of variable expansion
meta/recipes-core/busybox/busybox.inc | 4 ++-- meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.4.1
PATCH 1/1 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.
--- meta/recipes-core/busybox/busybox.inc | 4 ++-- meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/busybox/busybox.inc +2 -2
@@ -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)
meta/recipes-core/busybox/busybox_1.18.4.bb +1 -1
@@ -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 \
Signature · 1 line
1.7.4.1
Richard Purdie
AppliedQuoted 8 lines · Paul Eggleton
Expand
DISTRO_FEATURESandMACHINE_FEATURESfully so that any inner variable references (such asDISTRO_FEATURES_LIBC) are expanded properly.Signed-off-by Paul Eggleton <[email protected]>--- meta/recipes-core/busybox/busybox.inc | 4 ++-- meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
Merged to master, thanks.
Richard