summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/busybox/busybox.inc4
-rw-r--r--meta/recipes-core/busybox/busybox_1.18.4.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 1334d06964..c51cf6a124 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):
47# Map distro and machine features to config settings 47# Map distro and machine features to config settings
48def features_to_busybox_settings(d): 48def features_to_busybox_settings(d):
49 cnf, rem = ([], []) 49 cnf, rem = ([], [])
50 distro_features = bb.data.getVar('DISTRO_FEATURES', d).split() 50 distro_features = bb.data.getVar('DISTRO_FEATURES', d, True).split()
51 machine_features = bb.data.getVar('MACHINE_FEATURES', d).split() 51 machine_features = bb.data.getVar('MACHINE_FEATURES', d, True).split()
52 busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem) 52 busybox_cfg('ipv6', distro_features, 'CONFIG_FEATURE_IPV6', cnf, rem)
53 busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem) 53 busybox_cfg('largefile', distro_features, 'CONFIG_LFS', cnf, rem)
54 busybox_cfg('largefile', distro_features, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) 54 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 5883cc65cf..9d3d5b138e 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 @@
1require busybox.inc 1require busybox.inc
2PR = "r5" 2PR = "r6"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \