[PATCH 0/9] busybox: cleanup and fix config fragments

[PATCH 0/9] busybox: cleanup and fix config fragments

[Enrico Jörns]

Most of the busybox config fragments are useless since the respective options
were accidentally enabled in the 'defconfig' file during the defconfig update
to busybox 1.33.0 [1].

This is redundant and confusing and takes the ability to disable options by
removing the respective fragment file from the SRC_URI.

While cleaning this up, some other inconsistencies were found and fixed.

The series starts with a defconfig sync to the current defaults to have a clear
base to work on.

[1] 4335cd24 ("busybox: refresh the defconfig from 1.33.0")


Enrico Jörns (9):
  busybox: sync config for busybox 1.36.1
  busybox: disable defconfig options from simpler fragments
  busybox: disable defconfig options from syslogd.cfg
  busybox: mdev.cfg: remove CONFIG_SETSID
  busybox: disable defconfig options from login-utilities.cfg
  busybox: disable defconfig options from unicode.cfg
  busybox: getopts.cfg: disable long options
  busybox: disable long options in defconfig and fix longopts.cfg
  busybox: disable defconfig options from mount-via-label.cfg

 meta/recipes-core/busybox/busybox/defconfig   | 124 +++++++++---------
 meta/recipes-core/busybox/busybox/getopts.cfg |   2 -
 .../recipes-core/busybox/busybox/longopts.cfg |  11 +-
 meta/recipes-core/busybox/busybox/mdev.cfg    |   1 -
 4 files changed, 68 insertions(+), 70 deletions(-)

-- 
2.39.5

[PATCH 1/9] busybox: sync config for busybox 1.36.1

[Enrico Jörns]

Done by disabling all current cfg fragments in SRC_URI, running

  bitbake -c menuconfig busybox

and copying the generated .config back to the defoncfig file.
Changes to CONFIG_EXTRA_CFLAGS were omitted.

For CONFIG_SHA1_HWACCEL and CONFIG_SHA256_HWACCEL there was also an
explicit fragment 'sha_accel.cfg' introduced for disabling these, thus
it makes sense they've been enabled by default.

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 8e3b6e480c..3353aac97a 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.36.0
-# Tue Jan  3 14:17:01 2023
+# Busybox version: 1.36.1
+# Thu May 18 22:31:00 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -93,6 +93,9 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA1_SMALL=3
+CONFIG_SHA1_HWACCEL=y
+CONFIG_SHA256_HWACCEL=y
 CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_NON_POSIX_CP=y
 # CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
@@ -882,6 +885,7 @@ CONFIG_FEATURE_HWIB=y
 CONFIG_HOSTNAME=y
 CONFIG_DNSDOMAINNAME=y
 # CONFIG_HTTPD is not set
+CONFIG_FEATURE_HTTPD_PORT_DEFAULT=0
 # CONFIG_FEATURE_HTTPD_RANGES is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -974,6 +978,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_FEATURE_TELNET_WIDTH=y
 # CONFIG_TELNETD is not set
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
+CONFIG_FEATURE_TELNETD_PORT_DEFAULT=0
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 CONFIG_TFTP=y
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
@@ -1011,6 +1016,7 @@ CONFIG_UDHCPC=y
 CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC6_DEFAULT_SCRIPT=""
 # CONFIG_UDHCPC6 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
 # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
@@ -1020,6 +1026,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 #
 # Common options for DHCP applets
 #
+CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
 # CONFIG_FEATURE_UDHCP_PORT is not set
 CONFIG_UDHCP_DEBUG=0
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1144,6 +1151,7 @@ CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_ASH_ECHO=y
 CONFIG_ASH_PRINTF=y
 CONFIG_ASH_TEST=y
+CONFIG_ASH_SLEEP=y
 CONFIG_ASH_HELP=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_CMDCMD=y
-- 
2.39.5

[PATCH 2/9] busybox: disable defconfig options from simpler fragments

[Enrico Jörns]

This disables options from the defconfig file that are enabled by
explicit config fragments.

Having them enabled in the defconfig renders the fragments useless and
takes away the ability to disable options with

  SRC_URI:remove = "<fragment>.cfg".

The respective options were all deactivated once but got accidentally
enabled in 4335cd24 ("busybox: refresh the defconfig from 1.33.0").

This commit disables the features for:

- sha1sum.cfg
- sha256sum.cfg
- resize.cfg
- pgrep.cfg
- rev.cfg

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 3353aac97a..f152d63fad 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -281,8 +281,8 @@ CONFIG_FEATURE_LS_USERNAME=y
 CONFIG_FEATURE_LS_COLOR=y
 # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
 CONFIG_MD5SUM=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
+# CONFIG_SHA1SUM is not set
+# CONFIG_SHA256SUM is not set
 # CONFIG_SHA512SUM is not set
 # CONFIG_SHA3SUM is not set
 
@@ -386,8 +386,8 @@ CONFIG_DEFAULT_SETFONT_DIR=""
 CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
 CONFIG_RESET=y
-CONFIG_RESIZE=y
-CONFIG_FEATURE_RESIZE_PRINT=y
+# CONFIG_RESIZE is not set
+# CONFIG_FEATURE_RESIZE_PRINT is not set
 CONFIG_SETCONSOLE=y
 # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
 # CONFIG_SETKEYCODES is not set
@@ -688,7 +688,7 @@ CONFIG_RDATE=y
 # CONFIG_RDEV is not set
 # CONFIG_READPROFILE is not set
 CONFIG_RENICE=y
-CONFIG_REV=y
+# CONFIG_REV is not set
 # CONFIG_RTCWAKE is not set
 # CONFIG_SCRIPT is not set
 # CONFIG_SCRIPTREPLAY is not set
@@ -1066,7 +1066,7 @@ CONFIG_KILLALL=y
 # CONFIG_LSOF is not set
 # CONFIG_MPSTAT is not set
 # CONFIG_NMETER is not set
-CONFIG_PGREP=y
+# CONFIG_PGREP is not set
 # CONFIG_PKILL is not set
 CONFIG_PIDOF=y
 # CONFIG_FEATURE_PIDOF_SINGLE is not set
-- 
2.39.5

[PATCH 3/9] busybox: disable defconfig options from syslogd.cfg

[Enrico Jörns]

Accidentally enabled in
4335cd24 ("busybox: refresh the defconfig from 1.33.0").

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig | 22 +++++++++------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index f152d63fad..1f93ea90b3 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -1211,21 +1211,17 @@ CONFIG_FEATURE_SH_HISTFILESIZE=y
 # System Logging Utilities
 #
 CONFIG_KLOGD=y
-
-#
-# klogd should not be used together with syslog to kernel printk buffer
-#
 CONFIG_FEATURE_KLOGD_KLOGCTL=y
 CONFIG_LOGGER=y
 CONFIG_LOGREAD=y
 CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
-CONFIG_SYSLOGD=y
-CONFIG_FEATURE_ROTATE_LOGFILE=y
-CONFIG_FEATURE_REMOTE_LOG=y
-CONFIG_FEATURE_SYSLOGD_DUP=y
-CONFIG_FEATURE_SYSLOGD_CFG=y
+# CONFIG_SYSLOGD is not set
+# CONFIG_FEATURE_ROTATE_LOGFILE is not set
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
 # CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
-CONFIG_FEATURE_IPC_SYSLOG=y
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=64
-CONFIG_FEATURE_KMSG_SYSLOG=y
+CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+# CONFIG_FEATURE_KMSG_SYSLOG is not set
-- 
2.39.5

[PATCH 4/9] busybox: mdev.cfg: remove CONFIG_SETSID

[Enrico Jörns]

Was explicitly enabled in defconfig in
456010a0 ("busybox: Enable mountpoint and setsid applets").

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/mdev.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/recipes-core/busybox/busybox/mdev.cfg b/meta/recipes-core/busybox/busybox/mdev.cfg
index 143e6097cb..54d23597cc 100644
--- a/meta/recipes-core/busybox/busybox/mdev.cfg
+++ b/meta/recipes-core/busybox/busybox/mdev.cfg
@@ -5,7 +5,6 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 
-CONFIG_SETSID=y
 CONFIG_CTTYHACK=y
 
 CONFIG_FEATURE_SHADOWPASSWDS=y
-- 
2.39.5

[PATCH 5/9] busybox: disable defconfig options from login-utilities.cfg

[Enrico Jörns]

Accidentally enabled in
4335cd24 ("busybox: refresh the defconfig from 1.33.0").

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig | 28 ++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 1f93ea90b3..838a46631f 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -523,41 +523,41 @@ CONFIG_INIT_TERMINAL_TYPE=""
 #
 # Login/Password Management Utilities
 #
-CONFIG_FEATURE_SHADOWPASSWDS=y
+# CONFIG_FEATURE_SHADOWPASSWDS is not set
 # CONFIG_USE_BB_PWD_GRP is not set
 # CONFIG_USE_BB_SHADOW is not set
 CONFIG_USE_BB_CRYPT=y
 # CONFIG_USE_BB_CRYPT_SHA is not set
 # CONFIG_ADD_SHELL is not set
 # CONFIG_REMOVE_SHELL is not set
-CONFIG_ADDGROUP=y
+# CONFIG_ADDGROUP is not set
 # CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-CONFIG_ADDUSER=y
+# CONFIG_ADDUSER is not set
 # CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_LAST_ID=60000
-CONFIG_FIRST_SYSTEM_ID=100
-CONFIG_LAST_SYSTEM_ID=999
+CONFIG_LAST_ID=0
+CONFIG_FIRST_SYSTEM_ID=0
+CONFIG_LAST_SYSTEM_ID=0
 # CONFIG_CHPASSWD is not set
 CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
 # CONFIG_CRYPTPW is not set
 # CONFIG_MKPASSWD is not set
-CONFIG_DELUSER=y
-CONFIG_DELGROUP=y
+# CONFIG_DELUSER is not set
+# CONFIG_DELGROUP is not set
 # CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-CONFIG_GETTY=y
-CONFIG_LOGIN=y
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
 # CONFIG_LOGIN_SESSION_AS_CHILD is not set
 # CONFIG_LOGIN_SCRIPTS is not set
 # CONFIG_FEATURE_NOLOGIN is not set
 # CONFIG_FEATURE_SECURETTY is not set
-CONFIG_PASSWD=y
+# CONFIG_PASSWD is not set
 # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-CONFIG_SU=y
+# CONFIG_SU is not set
 # CONFIG_FEATURE_SU_SYSLOG is not set
 # CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
 # CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
-CONFIG_SULOGIN=y
-CONFIG_VLOCK=y
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
 
 #
 # Linux Ext2 FS Progs
-- 
2.39.5

[PATCH 6/9] busybox: disable defconfig options from unicode.cfg

[Enrico Jörns]

Accidentally enabled in
4335cd24 ("busybox: refresh the defconfig from 1.33.0").

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 838a46631f..defe60c2ab 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -116,13 +116,13 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
 # CONFIG_FEATURE_EDITING_WINCH is not set
 # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
 # CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_SUPPORT is not set
 # CONFIG_UNICODE_USING_LOCALE is not set
-CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-CONFIG_UNICODE_COMBINING_WCHARS=y
-CONFIG_UNICODE_WIDE_WCHARS=y
+# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
+CONFIG_SUBST_WCHAR=0
+CONFIG_LAST_SUPPORTED_WCHAR=0
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
-- 
2.39.5

[PATCH 7/9] busybox: getopts.cfg: disable long options

[Enrico Jörns]

We have longopts.cfg for long options.
And CONFIG_LONG_OPTS is the actual global switch for long options.
It seems inappropriate here.

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/getopts.cfg | 2 --
 1 file changed, 2 deletions(-)

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
-- 
2.39.5

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

[Enrico Jörns]

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

[PATCH 9/9] busybox: disable defconfig options from mount-via-label.cfg

[Enrico Jörns]

Accidentally enabled in
6a6c6442 ("busybox: refresh the defconfig from 1.33.0").

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 meta/recipes-core/busybox/busybox/defconfig | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig
index 25dfbe5c97..35e1e33c12 100644
--- a/meta/recipes-core/busybox/busybox/defconfig
+++ b/meta/recipes-core/busybox/busybox/defconfig
@@ -604,8 +604,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKDISCARD is not set
-CONFIG_BLKID=y
-CONFIG_FEATURE_BLKID_TYPE=y
+# CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
 # CONFIG_BLOCKDEV is not set
 # CONFIG_CAL is not set
 # CONFIG_CHRT is not set
@@ -673,7 +673,7 @@ CONFIG_MOUNT=y
 # CONFIG_FEATURE_MOUNT_FAKE is not set
 # CONFIG_FEATURE_MOUNT_VERBOSE is not set
 # CONFIG_FEATURE_MOUNT_HELPERS is not set
-CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_LABEL is not set
 # CONFIG_FEATURE_MOUNT_NFS is not set
 # CONFIG_FEATURE_MOUNT_CIFS is not set
 CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -721,19 +721,15 @@ CONFIG_FEATURE_UMOUNT_ALL=y
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
-CONFIG_VOLUMEID=y
-
-#
-# Filesystem/Volume identification
-#
+# CONFIG_VOLUMEID is not set
 # CONFIG_FEATURE_VOLUMEID_BCACHE is not set
-CONFIG_FEATURE_VOLUMEID_BTRFS=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-CONFIG_FEATURE_VOLUMEID_EROFS=y
+# CONFIG_FEATURE_VOLUMEID_EROFS is not set
 # CONFIG_FEATURE_VOLUMEID_EXFAT is not set
-CONFIG_FEATURE_VOLUMEID_EXT=y
-CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_FEATURE_VOLUMEID_FAT=y
+# CONFIG_FEATURE_VOLUMEID_EXT is not set
+# CONFIG_FEATURE_VOLUMEID_F2FS is not set
+# CONFIG_FEATURE_VOLUMEID_FAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
 # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
@@ -747,7 +743,7 @@ CONFIG_FEATURE_VOLUMEID_FAT=y
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_UBIFS is not set
 # CONFIG_FEATURE_VOLUMEID_UDF is not set
-- 
2.39.5

Re: [yocto] [PATCH 0/9] busybox: cleanup and fix config fragments

[Enrico Jörns]

Am Montag, dem 07.10.2024 um 14:09 +0200 schrieb Enrico Jörns:

[TO += Andrej Valek <andrej.v@skyrain.eu>]

> Most of the busybox config fragments are useless since the respective options
> were accidentally enabled in the 'defconfig' file during the defconfig update
> to busybox 1.33.0 [1].
> 
> This is redundant and confusing and takes the ability to disable options by
> removing the respective fragment file from the SRC_URI.
> 
> While cleaning this up, some other inconsistencies were found and fixed.
> 
> The series starts with a defconfig sync to the current defaults to have a clear
> base to work on.
> 
> [1] 4335cd24 ("busybox: refresh the defconfig from 1.33.0")
> 
> 
> Enrico Jörns (9):
>   busybox: sync config for busybox 1.36.1
>   busybox: disable defconfig options from simpler fragments
>   busybox: disable defconfig options from syslogd.cfg
>   busybox: mdev.cfg: remove CONFIG_SETSID
>   busybox: disable defconfig options from login-utilities.cfg
>   busybox: disable defconfig options from unicode.cfg
>   busybox: getopts.cfg: disable long options
>   busybox: disable long options in defconfig and fix longopts.cfg
>   busybox: disable defconfig options from mount-via-label.cfg
> 
>  meta/recipes-core/busybox/busybox/defconfig   | 124 +++++++++---------
>  meta/recipes-core/busybox/busybox/getopts.cfg |   2 -
>  .../recipes-core/busybox/busybox/longopts.cfg |  11 +-
>  meta/recipes-core/busybox/busybox/mdev.cfg    |   1 -
>  4 files changed, 68 insertions(+), 70 deletions(-)
> 

-- 
Pengutronix e.K.                           | Enrico Jörns                |
Embedded Linux Consulting & Support        | https://www.pengutronix.de/ |
Steuerwalder Str. 21                       | Phone: +49-5121-206917-180  |
31137 Hildesheim, Germany                  | Fax:   +49-5121-206917-9    |

Re: [yocto] [PATCH 0/9] busybox: cleanup and fix config fragments

[Andrej Valek]

Hi Enrico,

Could you please guide me to the right patch? I wasn't able to find it ;).

BR,
Andrej

On 24.10.2024 15:04, Enrico Jörns wrote:
> Am Montag, dem 07.10.2024 um 14:09 +0200 schrieb Enrico Jörns:
>
> [TO += Andrej Valek <andrej.v@skyrain.eu>]
>
>> Most of the busybox config fragments are useless since the respective options
>> were accidentally enabled in the 'defconfig' file during the defconfig update
>> to busybox 1.33.0 [1].
>>
>> This is redundant and confusing and takes the ability to disable options by
>> removing the respective fragment file from the SRC_URI.
>>
>> While cleaning this up, some other inconsistencies were found and fixed.
>>
>> The series starts with a defconfig sync to the current defaults to have a clear
>> base to work on.
>>
>> [1] 4335cd24 ("busybox: refresh the defconfig from 1.33.0")
>>
>>
>> Enrico Jörns (9):
>>    busybox: sync config for busybox 1.36.1
>>    busybox: disable defconfig options from simpler fragments
>>    busybox: disable defconfig options from syslogd.cfg
>>    busybox: mdev.cfg: remove CONFIG_SETSID
>>    busybox: disable defconfig options from login-utilities.cfg
>>    busybox: disable defconfig options from unicode.cfg
>>    busybox: getopts.cfg: disable long options
>>    busybox: disable long options in defconfig and fix longopts.cfg
>>    busybox: disable defconfig options from mount-via-label.cfg
>>
>>   meta/recipes-core/busybox/busybox/defconfig   | 124 +++++++++---------
>>   meta/recipes-core/busybox/busybox/getopts.cfg |   2 -
>>   .../recipes-core/busybox/busybox/longopts.cfg |  11 +-
>>   meta/recipes-core/busybox/busybox/mdev.cfg    |   1 -
>>   4 files changed, 68 insertions(+), 70 deletions(-)
>>

Re: [OE-core] [yocto] [PATCH 0/9] busybox: cleanup and fix config fragments

[Richard Purdie]

On Fri, 2024-10-25 at 17:01 +0200, Andrej Valek via lists.openembedded.org wrote:
> Could you please guide me to the right patch? I wasn't able to find
> it ;).

They're listed here:

https://lore.kernel.org/openembedded-core/a30ee7e5-bc6c-4490-9c10-2972138051b5@skyrain.eu/

Sorry about not getting these in before the upgrade, I'm a bit
distracted by the autobuilder changes and retesting the upgrade
distracted me further.

The fixes there do look really good so it would be great if we could
rebase them and get them merged,

Thanks,

Richard

Re: [OE-core] [yocto] [PATCH 0/9] busybox: cleanup and fix config fragments

[Andrej]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: Type: text/html, Size: 2559 bytes --]

Re: [OE-core] [yocto] [PATCH 0/9] busybox: cleanup and fix config fragments

[Richard Purdie]

On Fri, 2024-10-25 at 19:26 +0200, Andrej wrote:
> Ok, I was thinking that it was done by intention, but it happened 14y
> ago 
> https://github.com/openembedded/openembedded-core/commit/615a98ed9a02
> 1da245513790c064761a0a5a67e9 . So I guess not. 
> 
> Enrico, no 
>  problem, most of them could by integrated into defconfig. Please
> squash it into one commit if you're going to do it. Or let me know
> and I will take a care of it ;). 

In many ways I prefer having multiple changes showing an evolution as
those patches do, it does make review easier.

Cheers,

Richard

Re: [OE-core] [yocto] [PATCH 0/9] busybox: cleanup and fix config fragments

[Enrico Jörns]

Hi Andrej, Hi Richard,

Am Freitag, dem 25.10.2024 um 19:07 +0100 schrieb Richard Purdie:
> On Fri, 2024-10-25 at 19:26 +0200, Andrej wrote:
> > Ok, I was thinking that it was done by intention, but it happened 14y
> > ago 
> > https://github.com/openembedded/openembedded-core/commit/615a98ed9a02
> > 1da245513790c064761a0a5a67e9 . So I guess not. 

I am not sure if I fully understand what you are referring to here.
Could you provide some details about what happened there?
OE didn't have those fragments 14y ago I guess.

> > Enrico, no 
> >  problem, most of them could by integrated into defconfig. Please
> > squash it into one commit if you're going to do it. Or let me know
> > and I will take a care of it ;). 
> 
> In many ways I prefer having multiple changes showing an evolution as
> those patches do, it does make review easier.

Thanks Richard for stepping in! I've rebased and revised my patches now and sent a v2.

Regards, Enrico

> Cheers,
> 
> Richard
> 

-- 
Pengutronix e.K.                           | Enrico Jörns                |
Embedded Linux Consulting & Support        | https://www.pengutronix.de/ |
Steuerwalder Str. 21                       | Phone: +49-5121-206917-180  |
31137 Hildesheim, Germany                  | Fax:   +49-5121-206917-9    |