diff options
| author | Andre McCurdy <armccurdy@gmail.com> | 2015-07-30 13:56:23 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 22:24:13 +0100 |
| commit | 7ea959511d80616e3bb2bf88f7c5447e3aae2dc7 (patch) | |
| tree | 54249ab4629bd53ad29484f81171f824bdd3342d | |
| parent | be79846fdee61d6d39aebb527e488288131177ae (diff) | |
| download | poky-7ea959511d80616e3bb2bf88f7c5447e3aae2dc7.tar.gz | |
busybox: re-order defconfig to align with busybox 1.23.2
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.23.2 'make oldconfig'.
(From OE-Core rev: ee80d8bfe0a6f4ad8c5de38eac20319760c0fe8f)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/busybox/busybox/defconfig | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index aa7b782d08..ebe9354e19 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig | |||
| @@ -36,6 +36,7 @@ CONFIG_LAST_SUPPORTED_WCHAR=0 | |||
| 36 | # CONFIG_UNICODE_BIDI_SUPPORT is not set | 36 | # CONFIG_UNICODE_BIDI_SUPPORT is not set |
| 37 | # CONFIG_UNICODE_NEUTRAL_TABLE is not set | 37 | # CONFIG_UNICODE_NEUTRAL_TABLE is not set |
| 38 | # CONFIG_UNICODE_PRESERVE_BROKEN is not set | 38 | # CONFIG_UNICODE_PRESERVE_BROKEN is not set |
| 39 | # CONFIG_PAM is not set | ||
| 39 | CONFIG_LONG_OPTS=y | 40 | CONFIG_LONG_OPTS=y |
| 40 | CONFIG_FEATURE_DEVPTS=y | 41 | CONFIG_FEATURE_DEVPTS=y |
| 41 | # CONFIG_FEATURE_CLEAN_UP is not set | 42 | # CONFIG_FEATURE_CLEAN_UP is not set |
| @@ -133,7 +134,14 @@ CONFIG_FEATURE_SEAMLESS_Z=y | |||
| 133 | CONFIG_AR=y | 134 | CONFIG_AR=y |
| 134 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set | 135 | # CONFIG_FEATURE_AR_LONG_FILENAMES is not set |
| 135 | # CONFIG_FEATURE_AR_CREATE is not set | 136 | # CONFIG_FEATURE_AR_CREATE is not set |
| 137 | # CONFIG_UNCOMPRESS is not set | ||
| 138 | CONFIG_GUNZIP=y | ||
| 136 | CONFIG_BUNZIP2=y | 139 | CONFIG_BUNZIP2=y |
| 140 | # CONFIG_UNLZMA is not set | ||
| 141 | # CONFIG_FEATURE_LZMA_FAST is not set | ||
| 142 | # CONFIG_LZMA is not set | ||
| 143 | # CONFIG_UNXZ is not set | ||
| 144 | # CONFIG_XZ is not set | ||
| 137 | # CONFIG_BZIP2 is not set | 145 | # CONFIG_BZIP2 is not set |
| 138 | CONFIG_CPIO=y | 146 | CONFIG_CPIO=y |
| 139 | # CONFIG_FEATURE_CPIO_O is not set | 147 | # CONFIG_FEATURE_CPIO_O is not set |
| @@ -141,14 +149,13 @@ CONFIG_CPIO=y | |||
| 141 | # CONFIG_DPKG is not set | 149 | # CONFIG_DPKG is not set |
| 142 | # CONFIG_DPKG_DEB is not set | 150 | # CONFIG_DPKG_DEB is not set |
| 143 | # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set | 151 | # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set |
| 144 | CONFIG_GUNZIP=y | ||
| 145 | CONFIG_GZIP=y | 152 | CONFIG_GZIP=y |
| 146 | # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set | 153 | # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set |
| 147 | CONFIG_GZIP_FAST=0 | 154 | CONFIG_GZIP_FAST=0 |
| 148 | # CONFIG_LZOP is not set | 155 | # CONFIG_LZOP is not set |
| 149 | # CONFIG_LZOP_COMPR_HIGH is not set | 156 | # CONFIG_LZOP_COMPR_HIGH is not set |
| 150 | # CONFIG_RPM2CPIO is not set | ||
| 151 | # CONFIG_RPM is not set | 157 | # CONFIG_RPM is not set |
| 158 | # CONFIG_RPM2CPIO is not set | ||
| 152 | CONFIG_TAR=y | 159 | CONFIG_TAR=y |
| 153 | CONFIG_FEATURE_TAR_CREATE=y | 160 | CONFIG_FEATURE_TAR_CREATE=y |
| 154 | CONFIG_FEATURE_TAR_AUTODETECT=y | 161 | CONFIG_FEATURE_TAR_AUTODETECT=y |
| @@ -161,12 +168,6 @@ CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y | |||
| 161 | # CONFIG_FEATURE_TAR_UNAME_GNAME is not set | 168 | # CONFIG_FEATURE_TAR_UNAME_GNAME is not set |
| 162 | CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y | 169 | CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y |
| 163 | # CONFIG_FEATURE_TAR_SELINUX is not set | 170 | # CONFIG_FEATURE_TAR_SELINUX is not set |
| 164 | # CONFIG_UNCOMPRESS is not set | ||
| 165 | # CONFIG_UNLZMA is not set | ||
| 166 | # CONFIG_FEATURE_LZMA_FAST is not set | ||
| 167 | # CONFIG_LZMA is not set | ||
| 168 | # CONFIG_UNXZ is not set | ||
| 169 | # CONFIG_XZ is not set | ||
| 170 | CONFIG_UNZIP=y | 171 | CONFIG_UNZIP=y |
| 171 | 172 | ||
| 172 | # | 173 | # |
| @@ -360,7 +361,15 @@ CONFIG_WHICH=y | |||
| 360 | # | 361 | # |
| 361 | # Editors | 362 | # Editors |
| 362 | # | 363 | # |
| 364 | CONFIG_AWK=y | ||
| 365 | CONFIG_FEATURE_AWK_LIBM=y | ||
| 366 | CONFIG_CMP=y | ||
| 367 | CONFIG_DIFF=y | ||
| 368 | # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set | ||
| 369 | CONFIG_FEATURE_DIFF_DIR=y | ||
| 370 | # CONFIG_ED is not set | ||
| 363 | CONFIG_PATCH=y | 371 | CONFIG_PATCH=y |
| 372 | CONFIG_SED=y | ||
| 364 | CONFIG_VI=y | 373 | CONFIG_VI=y |
| 365 | CONFIG_FEATURE_VI_MAX_LEN=1024 | 374 | CONFIG_FEATURE_VI_MAX_LEN=1024 |
| 366 | CONFIG_FEATURE_VI_8BIT=y | 375 | CONFIG_FEATURE_VI_8BIT=y |
| @@ -375,14 +384,6 @@ CONFIG_FEATURE_VI_USE_SIGNALS=y | |||
| 375 | # CONFIG_FEATURE_VI_SET is not set | 384 | # CONFIG_FEATURE_VI_SET is not set |
| 376 | CONFIG_FEATURE_VI_WIN_RESIZE=y | 385 | CONFIG_FEATURE_VI_WIN_RESIZE=y |
| 377 | # CONFIG_FEATURE_VI_ASK_TERMINAL is not set | 386 | # CONFIG_FEATURE_VI_ASK_TERMINAL is not set |
| 378 | CONFIG_AWK=y | ||
| 379 | CONFIG_FEATURE_AWK_LIBM=y | ||
| 380 | CONFIG_CMP=y | ||
| 381 | CONFIG_DIFF=y | ||
| 382 | # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set | ||
| 383 | CONFIG_FEATURE_DIFF_DIR=y | ||
| 384 | # CONFIG_ED is not set | ||
| 385 | CONFIG_SED=y | ||
| 386 | CONFIG_FEATURE_ALLOW_EXEC=y | 387 | CONFIG_FEATURE_ALLOW_EXEC=y |
| 387 | 388 | ||
| 388 | # | 389 | # |
| @@ -467,7 +468,6 @@ CONFIG_LAST_SYSTEM_ID=999 | |||
| 467 | # CONFIG_GETTY is not set | 468 | # CONFIG_GETTY is not set |
| 468 | # CONFIG_LOGIN is not set | 469 | # CONFIG_LOGIN is not set |
| 469 | # CONFIG_LOGIN_SESSION_AS_CHILD is not set | 470 | # CONFIG_LOGIN_SESSION_AS_CHILD is not set |
| 470 | # CONFIG_PAM is not set | ||
| 471 | # CONFIG_LOGIN_SCRIPTS is not set | 471 | # CONFIG_LOGIN_SCRIPTS is not set |
| 472 | # CONFIG_FEATURE_NOLOGIN is not set | 472 | # CONFIG_FEATURE_NOLOGIN is not set |
| 473 | # CONFIG_FEATURE_SECURETTY is not set | 473 | # CONFIG_FEATURE_SECURETTY is not set |
| @@ -607,28 +607,32 @@ CONFIG_FEATURE_MOUNT_LOOP=y | |||
| 607 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y | 607 | CONFIG_FEATURE_MOUNT_LOOP_CREATE=y |
| 608 | # CONFIG_FEATURE_MTAB_SUPPORT is not set | 608 | # CONFIG_FEATURE_MTAB_SUPPORT is not set |
| 609 | CONFIG_VOLUMEID=y | 609 | CONFIG_VOLUMEID=y |
| 610 | CONFIG_FEATURE_VOLUMEID_EXT=y | ||
| 611 | # CONFIG_FEATURE_VOLUMEID_BTRFS is not set | 610 | # CONFIG_FEATURE_VOLUMEID_BTRFS is not set |
| 612 | # CONFIG_FEATURE_VOLUMEID_REISERFS is not set | 611 | # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set |
| 612 | CONFIG_FEATURE_VOLUMEID_EXT=y | ||
| 613 | CONFIG_FEATURE_VOLUMEID_FAT=y | 613 | CONFIG_FEATURE_VOLUMEID_FAT=y |
| 614 | # CONFIG_FEATURE_VOLUMEID_HFS is not set | 614 | # CONFIG_FEATURE_VOLUMEID_HFS is not set |
| 615 | # CONFIG_FEATURE_VOLUMEID_JFS is not set | ||
| 616 | # CONFIG_FEATURE_VOLUMEID_XFS is not set | ||
| 617 | # CONFIG_FEATURE_VOLUMEID_NTFS is not set | ||
| 618 | # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set | 615 | # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set |
| 619 | # CONFIG_FEATURE_VOLUMEID_UDF is not set | 616 | # CONFIG_FEATURE_VOLUMEID_JFS is not set |
| 620 | # CONFIG_FEATURE_VOLUMEID_LUKS is not set | 617 | # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set |
| 621 | # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set | 618 | # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set |
| 622 | # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set | 619 | # CONFIG_FEATURE_VOLUMEID_LUKS is not set |
| 620 | # CONFIG_FEATURE_VOLUMEID_NTFS is not set | ||
| 621 | # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set | ||
| 622 | # CONFIG_FEATURE_VOLUMEID_REISERFS is not set | ||
| 623 | # CONFIG_FEATURE_VOLUMEID_ROMFS is not set | 623 | # CONFIG_FEATURE_VOLUMEID_ROMFS is not set |
| 624 | # CONFIG_FEATURE_VOLUMEID_SYSV is not set | 624 | # CONFIG_FEATURE_VOLUMEID_SYSV is not set |
| 625 | # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set | 625 | # CONFIG_FEATURE_VOLUMEID_UDF is not set |
| 626 | # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set | 626 | # CONFIG_FEATURE_VOLUMEID_XFS is not set |
| 627 | 627 | ||
| 628 | # | 628 | # |
| 629 | # Miscellaneous Utilities | 629 | # Miscellaneous Utilities |
| 630 | # | 630 | # |
| 631 | # CONFIG_CONSPY is not set | 631 | # CONFIG_CONSPY is not set |
| 632 | # CONFIG_CROND is not set | ||
| 633 | # CONFIG_FEATURE_CROND_D is not set | ||
| 634 | # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set | ||
| 635 | CONFIG_FEATURE_CROND_DIR="" | ||
| 632 | CONFIG_LESS=y | 636 | CONFIG_LESS=y |
| 633 | CONFIG_FEATURE_LESS_MAXLINES=9999999 | 637 | CONFIG_FEATURE_LESS_MAXLINES=9999999 |
| 634 | CONFIG_FEATURE_LESS_BRACKETS=y | 638 | CONFIG_FEATURE_LESS_BRACKETS=y |
| @@ -641,13 +645,17 @@ CONFIG_FEATURE_LESS_FLAGS=y | |||
| 641 | # CONFIG_FEATURE_LESS_LINENUMS is not set | 645 | # CONFIG_FEATURE_LESS_LINENUMS is not set |
| 642 | # CONFIG_NANDWRITE is not set | 646 | # CONFIG_NANDWRITE is not set |
| 643 | # CONFIG_NANDDUMP is not set | 647 | # CONFIG_NANDDUMP is not set |
| 648 | CONFIG_RFKILL=y | ||
| 644 | # CONFIG_SETSERIAL is not set | 649 | # CONFIG_SETSERIAL is not set |
| 650 | # CONFIG_TASKSET is not set | ||
| 651 | # CONFIG_FEATURE_TASKSET_FANCY is not set | ||
| 645 | # CONFIG_UBIATTACH is not set | 652 | # CONFIG_UBIATTACH is not set |
| 646 | # CONFIG_UBIDETACH is not set | 653 | # CONFIG_UBIDETACH is not set |
| 647 | # CONFIG_UBIMKVOL is not set | 654 | # CONFIG_UBIMKVOL is not set |
| 648 | # CONFIG_UBIRMVOL is not set | 655 | # CONFIG_UBIRMVOL is not set |
| 649 | # CONFIG_UBIRSVOL is not set | 656 | # CONFIG_UBIRSVOL is not set |
| 650 | # CONFIG_UBIUPDATEVOL is not set | 657 | # CONFIG_UBIUPDATEVOL is not set |
| 658 | # CONFIG_WALL is not set | ||
| 651 | # CONFIG_ADJTIMEX is not set | 659 | # CONFIG_ADJTIMEX is not set |
| 652 | # CONFIG_BBCONFIG is not set | 660 | # CONFIG_BBCONFIG is not set |
| 653 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set | 661 | # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set |
| @@ -663,10 +671,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 | |||
| 663 | # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set | 671 | # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set |
| 664 | # CONFIG_FEATURE_CHAT_CLR_ABORT is not set | 672 | # CONFIG_FEATURE_CHAT_CLR_ABORT is not set |
| 665 | # CONFIG_CHRT is not set | 673 | # CONFIG_CHRT is not set |
| 666 | # CONFIG_CROND is not set | ||
| 667 | # CONFIG_FEATURE_CROND_D is not set | ||
| 668 | # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set | ||
| 669 | CONFIG_FEATURE_CROND_DIR="" | ||
| 670 | # CONFIG_CRONTAB is not set | 674 | # CONFIG_CRONTAB is not set |
| 671 | CONFIG_DC=y | 675 | CONFIG_DC=y |
| 672 | # CONFIG_FEATURE_DC_LIBM is not set | 676 | # CONFIG_FEATURE_DC_LIBM is not set |
| @@ -704,18 +708,14 @@ CONFIG_MICROCOM=y | |||
| 704 | # CONFIG_MT is not set | 708 | # CONFIG_MT is not set |
| 705 | # CONFIG_RAIDAUTORUN is not set | 709 | # CONFIG_RAIDAUTORUN is not set |
| 706 | # CONFIG_READAHEAD is not set | 710 | # CONFIG_READAHEAD is not set |
| 707 | CONFIG_RFKILL=y | ||
| 708 | # CONFIG_RUNLEVEL is not set | 711 | # CONFIG_RUNLEVEL is not set |
| 709 | # CONFIG_RX is not set | 712 | # CONFIG_RX is not set |
| 710 | # CONFIG_SETSID is not set | 713 | # CONFIG_SETSID is not set |
| 711 | CONFIG_STRINGS=y | 714 | CONFIG_STRINGS=y |
| 712 | # CONFIG_TASKSET is not set | ||
| 713 | # CONFIG_FEATURE_TASKSET_FANCY is not set | ||
| 714 | CONFIG_TIME=y | 715 | CONFIG_TIME=y |
| 715 | # CONFIG_TIMEOUT is not set | 716 | # CONFIG_TIMEOUT is not set |
| 716 | # CONFIG_TTYSIZE is not set | 717 | # CONFIG_TTYSIZE is not set |
| 717 | # CONFIG_VOLNAME is not set | 718 | # CONFIG_VOLNAME is not set |
| 718 | # CONFIG_WALL is not set | ||
| 719 | # CONFIG_WATCHDOG is not set | 719 | # CONFIG_WATCHDOG is not set |
| 720 | 720 | ||
| 721 | # | 721 | # |
| @@ -893,6 +893,13 @@ CONFIG_FEATURE_MIME_CHARSET="" | |||
| 893 | # CONFIG_PSTREE is not set | 893 | # CONFIG_PSTREE is not set |
| 894 | # CONFIG_PWDX is not set | 894 | # CONFIG_PWDX is not set |
| 895 | # CONFIG_SMEMCAP is not set | 895 | # CONFIG_SMEMCAP is not set |
| 896 | CONFIG_TOP=y | ||
| 897 | CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y | ||
| 898 | CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y | ||
| 899 | # CONFIG_FEATURE_TOP_SMP_CPU is not set | ||
| 900 | # CONFIG_FEATURE_TOP_DECIMALS is not set | ||
| 901 | # CONFIG_FEATURE_TOP_SMP_PROCESS is not set | ||
| 902 | # CONFIG_FEATURE_TOPMEM is not set | ||
| 896 | CONFIG_UPTIME=y | 903 | CONFIG_UPTIME=y |
| 897 | # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set | 904 | # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set |
| 898 | CONFIG_FREE=y | 905 | CONFIG_FREE=y |
| @@ -913,13 +920,6 @@ CONFIG_FEATURE_PS_LONG=y | |||
| 913 | # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set | 920 | # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set |
| 914 | CONFIG_RENICE=y | 921 | CONFIG_RENICE=y |
| 915 | CONFIG_BB_SYSCTL=y | 922 | CONFIG_BB_SYSCTL=y |
| 916 | CONFIG_TOP=y | ||
| 917 | CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y | ||
| 918 | CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y | ||
| 919 | # CONFIG_FEATURE_TOP_SMP_CPU is not set | ||
| 920 | # CONFIG_FEATURE_TOP_DECIMALS is not set | ||
| 921 | # CONFIG_FEATURE_TOP_SMP_PROCESS is not set | ||
| 922 | # CONFIG_FEATURE_TOPMEM is not set | ||
| 923 | # CONFIG_FEATURE_SHOW_THREADS is not set | 923 | # CONFIG_FEATURE_SHOW_THREADS is not set |
| 924 | CONFIG_WATCH=y | 924 | CONFIG_WATCH=y |
| 925 | 925 | ||
