| Submitter | Paul Eggleton |
|---|---|
| Date | July 12, 2011, 1:59 p.m. |
| Message ID | <e06067f253d42feefee8852f159de8a22d3f897b.1310478977.git.paul.eggleton@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/7413/ |
| State | Accepted |
| Headers | show |
Comments
On Tue, 2011-07-12 at 14:59 +0100, Paul Eggleton wrote: > 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> > --- > 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
Patch
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 1334d06..c51cf6a 100644 --- 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 5883cc6..9d3d5b1 100644 --- 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 \
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> --- meta/recipes-core/busybox/busybox.inc | 4 ++-- meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)