summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2015-10-13 11:42:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:12 +0000
commitf8ac40878cb1f698a7083c9dafe46f1f12b78862 (patch)
treeefb5f30cd5bf3a0cc1f8e014e6decb36c8070b5d /meta/recipes-core
parent3648a37b2d7d767061c43fa8f6aea56aa58d9afe (diff)
downloadpoky-f8ac40878cb1f698a7083c9dafe46f1f12b78862.tar.gz
busybox: re-order defconfig to align with busybox 1.24.1
No functional changes, simply re-order lines in defconfig so that the existing options don't move elsewhere in the file when run though busybox 1.24.1 'make oldconfig'. (From OE-Core rev: 28f197915d816ea249b036f8a4dfe11d477f94e7) 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>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox/defconfig38
1 files changed, 19 insertions, 19 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 4f5df9ebee..a5adea2fb6 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -183,10 +183,15 @@ CONFIG_DATE=y
183# CONFIG_FEATURE_DATE_ISOFMT is not set 183# CONFIG_FEATURE_DATE_ISOFMT is not set
184# CONFIG_FEATURE_DATE_NANO is not set 184# CONFIG_FEATURE_DATE_NANO is not set
185CONFIG_FEATURE_DATE_COMPAT=y 185CONFIG_FEATURE_DATE_COMPAT=y
186CONFIG_DD=y
187CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
188# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
189# CONFIG_FEATURE_DD_IBS_OBS is not set
186# CONFIG_HOSTID is not set 190# CONFIG_HOSTID is not set
187CONFIG_ID=y 191CONFIG_ID=y
188CONFIG_GROUPS=y 192CONFIG_GROUPS=y
189CONFIG_SHUF=y 193CONFIG_SHUF=y
194CONFIG_SYNC=y
190CONFIG_TEST=y 195CONFIG_TEST=y
191CONFIG_FEATURE_TEST_64=y 196CONFIG_FEATURE_TEST_64=y
192CONFIG_TOUCH=y 197CONFIG_TOUCH=y
@@ -211,10 +216,6 @@ CONFIG_CHROOT=y
211CONFIG_CP=y 216CONFIG_CP=y
212# CONFIG_FEATURE_CP_LONG_OPTIONS is not set 217# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
213CONFIG_CUT=y 218CONFIG_CUT=y
214CONFIG_DD=y
215CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
216# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
217# CONFIG_FEATURE_DD_IBS_OBS is not set
218CONFIG_DF=y 219CONFIG_DF=y
219# CONFIG_FEATURE_DF_FANCY is not set 220# CONFIG_FEATURE_DF_FANCY is not set
220CONFIG_DIRNAME=y 221CONFIG_DIRNAME=y
@@ -283,7 +284,6 @@ CONFIG_STAT=y
283CONFIG_FEATURE_STAT_FORMAT=y 284CONFIG_FEATURE_STAT_FORMAT=y
284CONFIG_STTY=y 285CONFIG_STTY=y
285# CONFIG_SUM is not set 286# CONFIG_SUM is not set
286CONFIG_SYNC=y
287# CONFIG_TAC is not set 287# CONFIG_TAC is not set
288CONFIG_TAIL=y 288CONFIG_TAIL=y
289CONFIG_FEATURE_FANCY_TAIL=y 289CONFIG_FEATURE_FANCY_TAIL=y
@@ -553,6 +553,15 @@ CONFIG_FSTRIM=y
553# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set 553# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
554# CONFIG_FEATURE_MDEV_EXEC is not set 554# CONFIG_FEATURE_MDEV_EXEC is not set
555# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set 555# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
556CONFIG_MOUNT=y
557# CONFIG_FEATURE_MOUNT_FAKE is not set
558# CONFIG_FEATURE_MOUNT_VERBOSE is not set
559# CONFIG_FEATURE_MOUNT_HELPERS is not set
560# CONFIG_FEATURE_MOUNT_LABEL is not set
561CONFIG_FEATURE_MOUNT_NFS=y
562# CONFIG_FEATURE_MOUNT_CIFS is not set
563CONFIG_FEATURE_MOUNT_FLAGS=y
564CONFIG_FEATURE_MOUNT_FSTAB=y
556# CONFIG_REV is not set 565# CONFIG_REV is not set
557# CONFIG_ACPID is not set 566# CONFIG_ACPID is not set
558# CONFIG_FEATURE_ACPID_COMPAT is not set 567# CONFIG_FEATURE_ACPID_COMPAT is not set
@@ -599,15 +608,6 @@ CONFIG_LOSETUP=y
599CONFIG_MKSWAP=y 608CONFIG_MKSWAP=y
600# CONFIG_FEATURE_MKSWAP_UUID is not set 609# CONFIG_FEATURE_MKSWAP_UUID is not set
601CONFIG_MORE=y 610CONFIG_MORE=y
602CONFIG_MOUNT=y
603# CONFIG_FEATURE_MOUNT_FAKE is not set
604# CONFIG_FEATURE_MOUNT_VERBOSE is not set
605# CONFIG_FEATURE_MOUNT_HELPERS is not set
606# CONFIG_FEATURE_MOUNT_LABEL is not set
607CONFIG_FEATURE_MOUNT_NFS=y
608# CONFIG_FEATURE_MOUNT_CIFS is not set
609CONFIG_FEATURE_MOUNT_FLAGS=y
610CONFIG_FEATURE_MOUNT_FSTAB=y
611CONFIG_PIVOT_ROOT=y 611CONFIG_PIVOT_ROOT=y
612CONFIG_RDATE=y 612CONFIG_RDATE=y
613# CONFIG_RDEV is not set 613# CONFIG_RDEV is not set
@@ -758,6 +758,11 @@ CONFIG_NC=y
758CONFIG_PING=y 758CONFIG_PING=y
759CONFIG_PING6=y 759CONFIG_PING6=y
760CONFIG_FEATURE_FANCY_PING=y 760CONFIG_FEATURE_FANCY_PING=y
761CONFIG_WGET=y
762CONFIG_FEATURE_WGET_STATUSBAR=y
763CONFIG_FEATURE_WGET_AUTHENTICATION=y
764CONFIG_FEATURE_WGET_LONG_OPTIONS=y
765CONFIG_FEATURE_WGET_TIMEOUT=y
761# CONFIG_WHOIS is not set 766# CONFIG_WHOIS is not set
762CONFIG_FEATURE_IPV6=y 767CONFIG_FEATURE_IPV6=y
763# CONFIG_FEATURE_UNIX_LOCAL is not set 768# CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -885,11 +890,6 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
885CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" 890CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
886# CONFIG_UDPSVD is not set 891# CONFIG_UDPSVD is not set
887# CONFIG_VCONFIG is not set 892# CONFIG_VCONFIG is not set
888CONFIG_WGET=y
889CONFIG_FEATURE_WGET_STATUSBAR=y
890CONFIG_FEATURE_WGET_AUTHENTICATION=y
891CONFIG_FEATURE_WGET_LONG_OPTIONS=y
892CONFIG_FEATURE_WGET_TIMEOUT=y
893# CONFIG_ZCIP is not set 893# CONFIG_ZCIP is not set
894 894
895# 895#