[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5193/8267] busybox: ignore the largefile distro feature ( always enable LFS )

[Emmanuele Bassi <ebassi src gnome org>]

commit 2b52d7ebc0a1dea68bfad8dcb048778ab00c631d
Author: Andre McCurdy <armccurdy gmail com>
Date:   Thu Mar 16 19:11:16 2017 -0700

    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>

 meta/recipes-core/busybox/busybox.inc       |    4 ++--
 meta/recipes-core/busybox/busybox/defconfig |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 34f4e25..6246c95 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):
 def features_to_busybox_settings(d):
        cnf, rem = ([], [])
        busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, 
rem)
-       busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_LFS', cnf, rem)
-       busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'largefile', True, False, d), 
'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
+       busybox_cfg(True, 'CONFIG_LFS', cnf, rem)
+       busybox_cfg(True, 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
        busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', 
cnf, rem)
        busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 
'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
        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 773c4f8..f649738 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -582,7 +582,7 @@ CONFIG_FEATURE_FBSET_READMODE=y
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
 CONFIG_FDISK=y
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set