[PATCH 8/9] busybox: disable long options in defconfig and fix longopts.cfg

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

LONG_OPTS was always enabled in defconfig, despite in
68dd1a54 ("busybox: Enable long options for enabled applets"),
an explicit fragment was introduced.

But the fragment did not set the global 'LONG_OPTS' but only activated
the individual options. However, these options are all 'default y' if
LONG_OPTS is enabled.

Re-generated longopts.cfg fragment buy disabling LONG_OPTS in defconfig
and running

  bitbake busybox -c menuconfig

Then re-enabled LONG_OTPS and ran

  bitbake busybox -c diffconfig

and copied back the generated fragment.

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

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index defe60c2ab..25dfbe5c97 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -12,7 +12,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_EXTRA_COMPAT is not set
 # CONFIG_FEDORA_COMPAT is not set
 # CONFIG_INCLUDE_SUSv2 is not set
-CONFIG_LONG_OPTS=y
+# CONFIG_LONG_OPTS is not set
 CONFIG_SHOW_USAGE=y
 # CONFIG_FEATURE_VERBOSE_USAGE is not set
 CONFIG_FEATURE_COMPRESS_USAGE=y
@@ -148,7 +148,7 @@ CONFIG_FEATURE_SEAMLESS_Z=y
 # CONFIG_UNCOMPRESS is not set
 CONFIG_GUNZIP=y
 CONFIG_ZCAT=y
-CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
+# CONFIG_FEATURE_GUNZIP_LONG_OPTIONS is not set
 CONFIG_BUNZIP2=y
 CONFIG_BZCAT=y
 # CONFIG_UNLZMA is not set
@@ -278,7 +278,7 @@ CONFIG_FEATURE_LS_WIDTH=y
 CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
-CONFIG_FEATURE_LS_COLOR=y
+# CONFIG_FEATURE_LS_COLOR is not set
 # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
 CONFIG_MD5SUM=y
 # CONFIG_SHA1SUM is not set
@@ -399,10 +399,10 @@ CONFIG_SETCONSOLE=y
 #
 # CONFIG_PIPE_PROGRESS is not set
 CONFIG_RUN_PARTS=y
-CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
 # CONFIG_FEATURE_RUN_PARTS_FANCY is not set
 CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
 CONFIG_WHICH=y
 
@@ -636,7 +636,7 @@ CONFIG_FLOCK=y
 # CONFIG_FSFREEZE is not set
 CONFIG_FSTRIM=y
 CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
+# CONFIG_FEATURE_GETOPT_LONG is not set
 CONFIG_HEXDUMP=y
 # CONFIG_HD is not set
 # CONFIG_XXD is not set
@@ -997,7 +997,7 @@ CONFIG_TRACEROUTE=y
 # CONFIG_FEATURE_TUNCTL_UG is not set
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_FTP=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
diff --git a/meta/recipes-core/busybox/busybox/longopts.cfg b/meta/recipes-core/busybox/busybox/longopts.cfg
index dcfab99919..fa9b0bda33 100644
--- a/meta/recipes-core/busybox/busybox/longopts.cfg
+++ b/meta/recipes-core/busybox/busybox/longopts.cfg
@@ -1,15 +1,16 @@
+CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_FEATURE_TAR_LONG_OPTIONS=y
+CONFIG_FEATURE_TAR_TO_COMMAND=y
 CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_FEATURE_CP_REFLINK=y
+CONFIG_FEATURE_LS_COLOR=y
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
 CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
 CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
-CONFIG_FEATURE_BC_LONG_OPTIONS=y
-CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
-CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
-CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
+CONFIG_FEATURE_GETOPT_LONG=y
 CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-- 
2.39.5