diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-10-13 11:42:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-01 21:32:12 +0000 |
commit | f8ac40878cb1f698a7083c9dafe46f1f12b78862 (patch) | |
tree | efb5f30cd5bf3a0cc1f8e014e6decb36c8070b5d /meta | |
parent | 3648a37b2d7d767061c43fa8f6aea56aa58d9afe (diff) | |
download | poky-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')
-rw-r--r-- | meta/recipes-core/busybox/busybox/defconfig | 38 |
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 |
185 | CONFIG_FEATURE_DATE_COMPAT=y | 185 | CONFIG_FEATURE_DATE_COMPAT=y |
186 | CONFIG_DD=y | ||
187 | CONFIG_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 |
187 | CONFIG_ID=y | 191 | CONFIG_ID=y |
188 | CONFIG_GROUPS=y | 192 | CONFIG_GROUPS=y |
189 | CONFIG_SHUF=y | 193 | CONFIG_SHUF=y |
194 | CONFIG_SYNC=y | ||
190 | CONFIG_TEST=y | 195 | CONFIG_TEST=y |
191 | CONFIG_FEATURE_TEST_64=y | 196 | CONFIG_FEATURE_TEST_64=y |
192 | CONFIG_TOUCH=y | 197 | CONFIG_TOUCH=y |
@@ -211,10 +216,6 @@ CONFIG_CHROOT=y | |||
211 | CONFIG_CP=y | 216 | CONFIG_CP=y |
212 | # CONFIG_FEATURE_CP_LONG_OPTIONS is not set | 217 | # CONFIG_FEATURE_CP_LONG_OPTIONS is not set |
213 | CONFIG_CUT=y | 218 | CONFIG_CUT=y |
214 | CONFIG_DD=y | ||
215 | CONFIG_FEATURE_DD_SIGNAL_HANDLING=y | ||
216 | # CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set | ||
217 | # CONFIG_FEATURE_DD_IBS_OBS is not set | ||
218 | CONFIG_DF=y | 219 | CONFIG_DF=y |
219 | # CONFIG_FEATURE_DF_FANCY is not set | 220 | # CONFIG_FEATURE_DF_FANCY is not set |
220 | CONFIG_DIRNAME=y | 221 | CONFIG_DIRNAME=y |
@@ -283,7 +284,6 @@ CONFIG_STAT=y | |||
283 | CONFIG_FEATURE_STAT_FORMAT=y | 284 | CONFIG_FEATURE_STAT_FORMAT=y |
284 | CONFIG_STTY=y | 285 | CONFIG_STTY=y |
285 | # CONFIG_SUM is not set | 286 | # CONFIG_SUM is not set |
286 | CONFIG_SYNC=y | ||
287 | # CONFIG_TAC is not set | 287 | # CONFIG_TAC is not set |
288 | CONFIG_TAIL=y | 288 | CONFIG_TAIL=y |
289 | CONFIG_FEATURE_FANCY_TAIL=y | 289 | CONFIG_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 |
556 | CONFIG_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 | ||
561 | CONFIG_FEATURE_MOUNT_NFS=y | ||
562 | # CONFIG_FEATURE_MOUNT_CIFS is not set | ||
563 | CONFIG_FEATURE_MOUNT_FLAGS=y | ||
564 | CONFIG_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 | |||
599 | CONFIG_MKSWAP=y | 608 | CONFIG_MKSWAP=y |
600 | # CONFIG_FEATURE_MKSWAP_UUID is not set | 609 | # CONFIG_FEATURE_MKSWAP_UUID is not set |
601 | CONFIG_MORE=y | 610 | CONFIG_MORE=y |
602 | CONFIG_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 | ||
607 | CONFIG_FEATURE_MOUNT_NFS=y | ||
608 | # CONFIG_FEATURE_MOUNT_CIFS is not set | ||
609 | CONFIG_FEATURE_MOUNT_FLAGS=y | ||
610 | CONFIG_FEATURE_MOUNT_FSTAB=y | ||
611 | CONFIG_PIVOT_ROOT=y | 611 | CONFIG_PIVOT_ROOT=y |
612 | CONFIG_RDATE=y | 612 | CONFIG_RDATE=y |
613 | # CONFIG_RDEV is not set | 613 | # CONFIG_RDEV is not set |
@@ -758,6 +758,11 @@ CONFIG_NC=y | |||
758 | CONFIG_PING=y | 758 | CONFIG_PING=y |
759 | CONFIG_PING6=y | 759 | CONFIG_PING6=y |
760 | CONFIG_FEATURE_FANCY_PING=y | 760 | CONFIG_FEATURE_FANCY_PING=y |
761 | CONFIG_WGET=y | ||
762 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
763 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
764 | CONFIG_FEATURE_WGET_LONG_OPTIONS=y | ||
765 | CONFIG_FEATURE_WGET_TIMEOUT=y | ||
761 | # CONFIG_WHOIS is not set | 766 | # CONFIG_WHOIS is not set |
762 | CONFIG_FEATURE_IPV6=y | 767 | CONFIG_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 | |||
885 | CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" | 890 | CONFIG_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 |
888 | CONFIG_WGET=y | ||
889 | CONFIG_FEATURE_WGET_STATUSBAR=y | ||
890 | CONFIG_FEATURE_WGET_AUTHENTICATION=y | ||
891 | CONFIG_FEATURE_WGET_LONG_OPTIONS=y | ||
892 | CONFIG_FEATURE_WGET_TIMEOUT=y | ||
893 | # CONFIG_ZCIP is not set | 893 | # CONFIG_ZCIP is not set |
894 | 894 | ||
895 | # | 895 | # |