[PATCH v2 7/9] busybox: disable defconfig options from getopts.cfg and move long opts

["Enrico Jörns" <ejo@pengutronix.de>]

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.

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig    | 4 ++--
 meta/recipes-core/busybox/busybox/getopts.cfg  | 2 --
 meta/recipes-core/busybox/busybox/longopts.cfg | 1 +
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index a65ae674d8..7481ea2d6b 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -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
diff --git a/meta/recipes-core/busybox/busybox/getopts.cfg b/meta/recipes-core/busybox/busybox/getopts.cfg
index 8db0a4a8f2..26a2e7add9 100644
--- a/meta/recipes-core/busybox/busybox/getopts.cfg
+++ b/meta/recipes-core/busybox/busybox/getopts.cfg
@@ -1,3 +1 @@
 CONFIG_GETOPT=y
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_GETOPT_LONG=y
diff --git a/meta/recipes-core/busybox/busybox/longopts.cfg b/meta/recipes-core/busybox/busybox/longopts.cfg
index dcfab99919..3255608f64 100644
--- a/meta/recipes-core/busybox/busybox/longopts.cfg
+++ b/meta/recipes-core/busybox/busybox/longopts.cfg
@@ -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
-- 
2.39.5