summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-03-16 19:11:16 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 11:35:20 +0000
commit2b52d7ebc0a1dea68bfad8dcb048778ab00c631d (patch)
treee8b9c5c3885dad83e882a176a41b4b92ad5ab62c
parentc13eb4ff7caff24387c28c38963190c9c3dd9b62 (diff)
downloadpoky-2b52d7ebc0a1dea68bfad8dcb048778ab00c631d.tar.gz
busybox: ignore the largefile distro feature ( always enable LFS )
(From OE-Core rev: f16723f66837a2acad3c114e4064e0ab1cb3a7a6) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/busybox/busybox.inc4
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 34f4e254f1..6246c95380 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -63,8 +63,8 @@ def busybox_cfg(feature, tokens, cnf, rem):
63def features_to_busybox_settings(d): 63def features_to_busybox_settings(d):
64 cnf, rem = ([], []) 64 cnf, rem = ([], [])
65 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) 65 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem)
66 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_LFS', cnf, rem) 66 busybox_cfg(True, 'CONFIG_LFS', cnf, rem)
67 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) 67 busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
68 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) 68 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem)
69 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) 69 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
70 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) 70 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 773c4f807f..f649738120 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -582,7 +582,7 @@ CONFIG_FEATURE_FBSET_READMODE=y
582# CONFIG_FDFLUSH is not set 582# CONFIG_FDFLUSH is not set
583# CONFIG_FDFORMAT is not set 583# CONFIG_FDFORMAT is not set
584CONFIG_FDISK=y 584CONFIG_FDISK=y
585# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set 585CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
586CONFIG_FEATURE_FDISK_WRITABLE=y 586CONFIG_FEATURE_FDISK_WRITABLE=y
587# CONFIG_FEATURE_AIX_LABEL is not set 587# CONFIG_FEATURE_AIX_LABEL is not set
588# CONFIG_FEATURE_SGI_LABEL is not set 588# CONFIG_FEATURE_SGI_LABEL is not set