busybox: disable defconfig options from getopts.cfg and move long opts

This disables getopts.cfg fragment options in the defconfig which were
accidentally enabled in 4335cd24 ("busybox: refresh the defconfig from
1.33.0").

Since there is longopts.cfg for long options, move
CONFIG_FEATURE_GETOPT_LONG there. It was probably not placed there
originally since it does not match the naming scheme of the other long
options.

Note that CONFIG_LONG_OPTS will just be dropped since it is enabled in
defconfig anyway.

(From OE-Core rev: 9022cff09c78fa1e0ac8e2b94c1992caa40074c4)

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Enrico Jörns
2024-10-28 09:29:11 +01:00
committed by Richard Purdie
parent 215930512d
commit 5063bc8fef
3 changed files with 3 additions and 4 deletions

View File

@@ -636,8 +636,8 @@ CONFIG_FLOCK=y
# CONFIG_FSCK_MINIX is not set
# CONFIG_FSFREEZE is not set
CONFIG_FSTRIM=y
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
# CONFIG_GETOPT is not set
# CONFIG_FEATURE_GETOPT_LONG is not set
CONFIG_HEXDUMP=y
# CONFIG_HD is not set
# CONFIG_XXD is not set

View File

@@ -1,3 +1 @@
CONFIG_GETOPT=y
CONFIG_LONG_OPTS=y
CONFIG_FEATURE_GETOPT_LONG=y

View File

@@ -13,3 +13,4 @@ CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_GETOPT_LONG=y