* [ptxdist] [PATCH] busybox: version bump 1.37.0 -> 1.38.0
@ 2026-05-30 8:19 Ladislav Michl
2026-06-25 19:23 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Ladislav Michl @ 2026-05-30 8:19 UTC (permalink / raw)
To: ptxdist
From: Ladislav Michl <ladis@triops.cz>
Signed-off-by: Ladislav Michl <ladis@triops.cz>
---
config/busybox/Config.in | 7 ++++
config/busybox/archival/Config.in | 11 ++++++
config/busybox/coreutils/Config.in | 14 +++++--
config/busybox/libbb/Config.in | 4 +-
config/busybox/loginutils/Config.in | 13 ++++++-
config/busybox/networking/Config.in | 15 ++++++++
config/busybox/procps/Config.in | 5 +++
config/busybox/runit/Config.in | 3 +-
config/busybox/shell/Config.in | 33 +++++++++++++++--
config/busybox/util-linux/Config.in | 17 ++++++++-
...printing-lines-during-tab-completion.patch | 37 -------------------
...needit-fix-left-over-print-to-stdout.patch | 33 -----------------
.../0200-reactivate-check-for-tty.patch | 0
...-only-pass-real-libs-to-SELINUX_LIBS.patch | 0
...honour-SKIP_STRIP-and-don-t-strip-if.patch | 0
...-Fix-compilation-with-Linux-v6.8-rc1.patch | 0
.../{busybox-1.37.0 => busybox-1.38.0}/series | 4 +-
rules/busybox.make | 4 +-
rules/coreutils.in | 4 ++
rules/procps.in | 4 ++
rules/util-linux.in | 8 ++++
21 files changed, 128 insertions(+), 88 deletions(-)
delete mode 100644 patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch
delete mode 100644 patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch
rename patches/{busybox-1.37.0 => busybox-1.38.0}/0200-reactivate-check-for-tty.patch (100%)
rename patches/{busybox-1.37.0 => busybox-1.38.0}/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch (100%)
rename patches/{busybox-1.37.0 => busybox-1.38.0}/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch (100%)
rename patches/{busybox-1.37.0 => busybox-1.38.0}/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch (100%)
rename patches/{busybox-1.37.0 => busybox-1.38.0}/series (68%)
diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index 2e3a8f1ba..58f395f90 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -204,6 +204,13 @@ config BUSYBOX_FEATURE_INSTALLER
busybox at runtime to create hard links or symlinks for all the
applets that are compiled into busybox.
+config BUSYBOX_FEATURE_VERSION
+ bool "Support --version"
+ default y
+ depends on BUSYBOX_BUSYBOX
+ help
+ Enable 'busybox --version' support.
+
config BUSYBOX_INSTALL_NO_USR
bool "Don't use /usr"
default n
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index aa4fea528..88cd03c56 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -447,4 +447,15 @@ config BUSYBOX_FEATURE_LZMA_FAST
This option reduces decompression time by about 25% at the cost of
a 1K bigger binary.
+config BUSYBOX_FEATURE_PATH_TRAVERSAL_PROTECTION
+ bool "Prevent extraction of filenames with /../ path component"
+ default n
+ help
+ busybox tar and unzip remove "PREFIX/../" (if it exists)
+ from extracted names.
+ This option enables this behavior for all other unpacking applets,
+ such as cpio, ar, rpm.
+ GNU cpio 2.15 has NO such sanity check.
+# try other archivers and document their behavior?
+
endmenu
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 6c4704f00..b36a6b213 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -485,6 +485,12 @@ config BUSYBOX_SHA256SUM
help
Compute and check SHA256 message digest
+config BUSYBOX_SHA384SUM
+ bool "sha384sum (7.3 kb)"
+ default y
+ help
+ Compute and check SHA384 message digest
+
config BUSYBOX_SHA512SUM
bool "sha512sum (7.3 kb)"
default y
@@ -497,13 +503,13 @@ config BUSYBOX_SHA3SUM
help
Compute and check SHA3 message digest
-comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
- depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
+comment "Common options for md5sum, sha1sum, sha256sum, ..., sha3sum"
+ depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA384SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
bool "Enable -c, -s and -w options"
default y
- depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
+ depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA384SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
help
Enabling the -c options allows files to be checked
against pre-calculated hash values.
@@ -875,7 +881,7 @@ config BUSYBOX_UNAME_OSNAME
depends on BUSYBOX_UNAME
help
Sets the operating system name reported by uname -o. The
- default is "
+ default is "GNU/Linux".
config BUSYBOX_BB_ARCH
bool "arch (1.4 kb)"
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 66c135ec6..73aa9805e 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -238,8 +238,8 @@ config BUSYBOX_FEATURE_EDITING_VI
config BUSYBOX_FEATURE_EDITING_HISTORY
int "History size"
# Don't allow way too big values here, code uses fixed "char *history[N]" struct member
- range 0 9999
- default 255
+ range 0 2000
+ default 200
depends on BUSYBOX_FEATURE_EDITING
help
Specify command history size (0 - disable).
diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in
index 5a406110f..6cf60ed22 100644
--- a/config/busybox/loginutils/Config.in
+++ b/config/busybox/loginutils/Config.in
@@ -92,6 +92,17 @@ config BUSYBOX_USE_BB_CRYPT_SHA
With this option off, login will fail password check for any
user which has password encrypted with these algorithms.
+config BUSYBOX_USE_BB_CRYPT_YES
+ bool "Enable yescrypt functions"
+ default y
+ depends on BUSYBOX_USE_BB_CRYPT
+ help
+ Enable this if you have passwords starting with "$y$" or
+ in your /etc/passwd or /etc/shadow files. These passwords
+ are hashed using yescrypt algorithms.
+ With this option off, login will fail password check for any
+ user which has password encrypted with these algorithms.
+
config BUSYBOX_ADD_SHELL
bool "add-shell (3.3 kb)"
default y if BUSYBOX_DESKTOP
@@ -171,7 +182,7 @@ config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO
default "des"
depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW || BUSYBOX_CHPASSWD
help
- Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
+ Possible choices: "d[es]", "m[d5]", "s[ha256]", "sha512", "yescrypt"
config BUSYBOX_CRYPTPW
bool "cryptpw (15 kb)"
default y
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index e6af8b7b2..c5f6e8880 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -876,6 +876,13 @@ config BUSYBOX_SSL_CLIENT
select BUSYBOX_TLS
help
This tool pipes data to/from a socket, TLS-encrypting it.
+config BUSYBOX_SSL_SERVER
+ bool "ssl_server (test TLS server)"
+ default y
+ select BUSYBOX_TLS
+ help
+ inetd-style TLS server. Stdin/stdout are already connected
+ to an accepted TCP socket.
config BUSYBOX_TC
bool "tc (8.3 kb)"
default y
@@ -970,6 +977,14 @@ config BUSYBOX_TELNETD
with all that done, telnetd _should_ work....
+config BUSYBOX_FEATURE_TELNETD_SELFTEST_DEBUG
+ bool "Include self-test (telnetd -@)"
+ default n
+ depends on BUSYBOX_TELNETD
+ help
+ Include self-test code for pty/vhangup() behavior.
+ Useful for development and validation on new platforms.
+
config BUSYBOX_FEATURE_TELNETD_STANDALONE
bool "Support standalone telnetd (not inetd only)"
default y
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index 9af81b44e..98c8f8bfb 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -267,6 +267,11 @@ config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT
depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP
help
Display the number of users currently logged on.
+config BUSYBOX_VMSTAT
+ bool "vmstat (2 kb)"
+ default y
+ help
+ Report virtual memory statistics
config BUSYBOX_WATCH
bool "watch (5.2 kb)"
default y
diff --git a/config/busybox/runit/Config.in b/config/busybox/runit/Config.in
index 144787952..2d63d1b0f 100644
--- a/config/busybox/runit/Config.in
+++ b/config/busybox/runit/Config.in
@@ -17,7 +17,8 @@ config BUSYBOX_SETUIDGID
bool "setuidgid (4.2 kb)"
default y
help
- Sets soft resource limits as specified by options
+ Sets UID and GID to those of the given account, and execs
+ specified program.
config BUSYBOX_ENVUIDGID
bool "envuidgid (4.1 kb)"
diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
index 2b920033d..9733c9d5f 100644
--- a/config/busybox/shell/Config.in
+++ b/config/busybox/shell/Config.in
@@ -143,6 +143,11 @@ config BUSYBOX_ASH_JOB_CONTROL
bool "Job control"
default y
depends on BUSYBOX_SHELL_ASH
+ help
+ Enable 'fg', 'bg', 'jobs' and 'kill' builtins.
+ Shell will track whether backgrounded pipes are stopped
+ by signals, and allow to restart them by 'fg' or 'bg'.
+ Otherwise, it will only track whether they have terminated.
config BUSYBOX_ASH_ALIAS
bool "Alias support"
@@ -276,7 +281,7 @@ config BUSYBOX_HUSH
It will compile and work on no-mmu systems.
- It does not handle select, aliases, tilde expansion,
+ It does not handle select, tilde expansion,
&>file and >&file redirection of stdout+stderr.
config BUSYBOX_SHELL_HUSH
@@ -287,6 +292,11 @@ config BUSYBOX_SHELL_HUSH
# It's only needed to get "nice" menuconfig indenting.
if BUSYBOX_SHELL_HUSH || BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
+config BUSYBOX_HUSH_NEED_FOR_SPEED
+ bool "Faster, but larger code"
+ default y
+ depends on BUSYBOX_SHELL_HUSH
+
config BUSYBOX_HUSH_BASH_COMPAT
bool "bash-compatible extensions"
default y
@@ -361,6 +371,13 @@ config BUSYBOX_HUSH_CASE
help
Enable case ... esac statement. +400 bytes.
+config BUSYBOX_HUSH_ALIAS
+ bool "Support aliases"
+ default y
+ depends on BUSYBOX_SHELL_HUSH
+ help
+ Enable aliases.
+
config BUSYBOX_HUSH_FUNCTIONS
bool "Support funcname() { commands; } syntax"
default y
@@ -368,6 +385,13 @@ config BUSYBOX_HUSH_FUNCTIONS
help
Enable support for shell functions. +800 bytes.
+config BUSYBOX_HUSH_FUNCTION_KEYWORD
+ bool "Support function keyword"
+ default y
+ depends on BUSYBOX_HUSH_FUNCTIONS
+ help
+ Support "function FUNCNAME { CMD; }" syntax.
+
config BUSYBOX_HUSH_LOCAL
bool "local builtin"
default y
@@ -580,9 +604,10 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE
default y
depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
help
- This option makes busybox shells to use $HISTFILESIZE variable
- to set shell history size. Note that its max value is capped
- by "History size" setting in library tuning section.
+ This option makes busybox shells to use $HISTSIZE and
+ $HISTFILESIZE variables to set shell history size.
+ Note that its max value is capped by "History size" setting
+ in library tuning section.
config BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
bool "Embed scripts in the binary"
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index 8008c5c0d..1e0e1f113 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -161,7 +161,12 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
bool "Support over 4GB disks"
default y
depends on BUSYBOX_FDISK
- depends on !BUSYBOX_LFS # with LFS no special code is needed
+ depends on !BUSYBOX_LFS # with BUSYBOX_LFS no special code is needed
+
+config BUSYBOX_FEATURE_FDISK_BLKSIZE
+ bool "Support -s option to list sizes"
+ default y
+ depends on BUSYBOX_FDISK
config BUSYBOX_FEATURE_FDISK_WRITABLE
bool "Write support"
@@ -371,6 +376,11 @@ config BUSYBOX_LOSETUP
losetup is used to associate or detach a loop device with a regular
file or block device, and to query the status of a loop device. This
version does not currently support enabling data encryption.
+config BUSYBOX_LSBLK
+ bool "lsblk (2.5 kb)"
+ default y
+ help
+ List information about all available or specified block devices.
config BUSYBOX_LSPCI
bool "lspci (6.4 kb)"
default y
@@ -888,6 +898,11 @@ config BUSYBOX_UNSHARE
select BUSYBOX_LONG_OPTS
help
Run program with some namespaces unshared from parent.
+config BUSYBOX_UUIDGEN
+ bool "uuidgen (1.1 kb)"
+ default y
+ help
+ Generate a UUID (Universally Unique Identifier) in RFC 4122 format.
config BUSYBOX_WALL
bool "wall (2.9 kb)"
default y
diff --git a/patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch b/patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch
deleted file mode 100644
index d9864d8d7..000000000
--- a/patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c443f2d2c67b5e5080632819980799c55b7bb89f Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Thu, 17 Apr 2025 11:00:43 +0200
-Subject: [PATCH 1/2] lineedit: fix printing lines during tab completion
-
-Indentation and escape characters are all output to stderr now, but the
-matches themself remained on stdout leading to garbled output on Tab
-completion.
-
-Print the results to stderr as well to fix this.
-
-Fixes: fd47f056765a ("lineedit: print prompt and editing operations to stderr")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- libbb/lineedit.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index 543a3f11c3e4..1f4b011008b6 100644
---- a/libbb/lineedit.c
-+++ b/libbb/lineedit.c
-@@ -1170,9 +1170,10 @@ static void showfiles(void)
- );
- }
- if (ENABLE_UNICODE_SUPPORT)
-- puts(printable_string(matches[n]));
-+ fputs(printable_string(matches[n]), stderr);
- else
-- puts(matches[n]);
-+ fputs(matches[n], stderr);
-+ bb_putchar_stderr('\n');
- }
- }
-
---
-2.39.5
-
diff --git a/patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch b/patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch
deleted file mode 100644
index 6c0d00e18..000000000
--- a/patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 40a8532dea18363fb67466e1b02651cc964017e8 Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Thu, 17 Apr 2025 11:00:43 +0200
-Subject: [PATCH 2/2] lineedit: fix left-over print to stdout
-
-There's code printing to stderr both before and after the single call to
-puts inside put_cur_glyph_and_inc_cursor().
-
-This is likely an oversight as we want everything to go through the
-same file descriptor, so switch it over to fputs.
-
-Fixes: fd47f056765a ("lineedit: print prompt and editing operations to stderr")
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
----
- libbb/lineedit.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index 1f4b011008b6..206fc36ef5c0 100644
---- a/libbb/lineedit.c
-+++ b/libbb/lineedit.c
-@@ -451,7 +451,7 @@ static void put_cur_glyph_and_inc_cursor(void)
- * have automargin (IOW: it is moving cursor to next line
- * by itself (which is wrong for VT-10x terminals)),
- * this will break things: there will be one extra empty line */
-- puts("\r"); /* + implicit '\n' */
-+ fputs("\r\n", stderr);
- #else
- /* VT-10x terminals don't wrap cursor to next line when last char
- * on the line is printed - cursor stays "over" this char.
---
-2.39.5
-
diff --git a/patches/busybox-1.37.0/0200-reactivate-check-for-tty.patch b/patches/busybox-1.38.0/0200-reactivate-check-for-tty.patch
similarity index 100%
rename from patches/busybox-1.37.0/0200-reactivate-check-for-tty.patch
rename to patches/busybox-1.38.0/0200-reactivate-check-for-tty.patch
diff --git a/patches/busybox-1.37.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.38.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
similarity index 100%
rename from patches/busybox-1.37.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
rename to patches/busybox-1.38.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
diff --git a/patches/busybox-1.37.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.38.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
similarity index 100%
rename from patches/busybox-1.37.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
rename to patches/busybox-1.38.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
diff --git a/patches/busybox-1.37.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch b/patches/busybox-1.38.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
similarity index 100%
rename from patches/busybox-1.37.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
rename to patches/busybox-1.38.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
diff --git a/patches/busybox-1.37.0/series b/patches/busybox-1.38.0/series
similarity index 68%
rename from patches/busybox-1.37.0/series
rename to patches/busybox-1.38.0/series
index f403c5683..87fee5091 100644
--- a/patches/busybox-1.37.0/series
+++ b/patches/busybox-1.38.0/series
@@ -7,6 +7,4 @@
0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
-0204-lineedit-fix-printing-lines-during-tab-completion.patch
-0205-lineedit-fix-left-over-print-to-stdout.patch
-# de06cc1132910215a67ae025e9b0aaa9 - git-ptx-patches magic
+# e781b8c6838e27fd021f9c1a9f87654d - git-ptx-patches magic
diff --git a/rules/busybox.make b/rules/busybox.make
index bb7d58daf..c92a370a8 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox
#
# Paths and names
#
-BUSYBOX_VERSION := 1.37.0
-BUSYBOX_SHA256 := 3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4
+BUSYBOX_VERSION := 1.38.0
+BUSYBOX_SHA256 := 34f9ea6ff8636f2c9241153b9114eefa9e65674a45318ae1ef95bb5f31c53bb2
BUSYBOX := busybox-$(BUSYBOX_VERSION)
BUSYBOX_SUFFIX := tar.bz2
BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)
diff --git a/rules/coreutils.in b/rules/coreutils.in
index c8ba498fb..504283736 100644
--- a/rules/coreutils.in
+++ b/rules/coreutils.in
@@ -206,6 +206,10 @@ comment "busybox' tty is selected!"
config COREUTILS_SHA384SUM
bool
prompt "sha384sum"
+ depends on !BUSYBOX_SHA384SUM || ALLYES
+
+comment "busybox' sha384sum is selected!"
+ depends on BUSYBOX_SHA384SUM
config COREUTILS_CUT
bool
diff --git a/rules/procps.in b/rules/procps.in
index 1d8c9e35c..fc0acb12d 100644
--- a/rules/procps.in
+++ b/rules/procps.in
@@ -160,10 +160,14 @@ comment "busybox' uptime is selected!"
config PROCPS_VMSTAT
bool
prompt "vmstat"
+ depends on !BUSYBOX_VMSTAT || ALLYES
help
vmstat reports information about processes, memory,
paging, block IO, traps, disks and cpu activity.
+comment "busybox' vmstat is selected!"
+ depends on BUSYBOX_VMSTAT
+
config PROCPS_W
bool
prompt "w"
diff --git a/rules/util-linux.in b/rules/util-linux.in
index ff68e5377..f997b188a 100644
--- a/rules/util-linux.in
+++ b/rules/util-linux.in
@@ -248,10 +248,14 @@ config UTIL_LINUX_LSBLK
select UTIL_LINUX_LIBSMARTCOLS
select UTIL_LINUX_LIBTCOLORS
prompt "lsblk"
+ depends on !BUSYBOX_LSBLK || ALLYES
help
The lsblk command lists information about all available or the
specified block devices.
+comment "BusyBox' lsblk is selected!"
+ depends on BUSYBOX_LSBLK
+
config UTIL_LINUX_MCOOKIE
bool
prompt "mcookie"
@@ -273,9 +277,13 @@ config UTIL_LINUX_UUIDGEN
bool
select UTIL_LINUX_LIBUUID
prompt "uuidgen"
+ depends on !BUSYBOX_UUIDGEN || ALLYES
help
uuidgen is a command-line utility to create a new UUID value.
+comment "BusyBox' uuidgen is selected!"
+ depends on BUSYBOX_UUIDGEN
+
config UTIL_LINUX_WAITPID
bool
prompt "waitpid"
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] busybox: version bump 1.37.0 -> 1.38.0
2026-05-30 8:19 [ptxdist] [PATCH] busybox: version bump 1.37.0 -> 1.38.0 Ladislav Michl
@ 2026-06-25 19:23 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2026-06-25 19:23 UTC (permalink / raw)
To: ptxdist; +Cc: Ladislav Michl
Thanks, applied as 23a979588d25c1517a1c03a823d6453d2e78513f.
Michael
[sent from post-receive hook]
On Thu, 25 Jun 2026 21:23:25 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Signed-off-by: Ladislav Michl <ladis@triops.cz>
> Message-Id: <ahqdfbYuQVi6Qf6W@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/config/busybox/Config.in b/config/busybox/Config.in
> index 2e3a8f1ba29d..58f395f90491 100644
> --- a/config/busybox/Config.in
> +++ b/config/busybox/Config.in
> @@ -204,6 +204,13 @@ config BUSYBOX_FEATURE_INSTALLER
> busybox at runtime to create hard links or symlinks for all the
> applets that are compiled into busybox.
>
> +config BUSYBOX_FEATURE_VERSION
> + bool "Support --version"
> + default y
> + depends on BUSYBOX_BUSYBOX
> + help
> + Enable 'busybox --version' support.
> +
> config BUSYBOX_INSTALL_NO_USR
> bool "Don't use /usr"
> default n
> diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
> index aa4fea528859..88cd03c5602e 100644
> --- a/config/busybox/archival/Config.in
> +++ b/config/busybox/archival/Config.in
> @@ -447,4 +447,15 @@ config BUSYBOX_FEATURE_LZMA_FAST
> This option reduces decompression time by about 25% at the cost of
> a 1K bigger binary.
>
> +config BUSYBOX_FEATURE_PATH_TRAVERSAL_PROTECTION
> + bool "Prevent extraction of filenames with /../ path component"
> + default n
> + help
> + busybox tar and unzip remove "PREFIX/../" (if it exists)
> + from extracted names.
> + This option enables this behavior for all other unpacking applets,
> + such as cpio, ar, rpm.
> + GNU cpio 2.15 has NO such sanity check.
> +# try other archivers and document their behavior?
> +
> endmenu
> diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
> index 6c4704f005e5..b36a6b213afa 100644
> --- a/config/busybox/coreutils/Config.in
> +++ b/config/busybox/coreutils/Config.in
> @@ -485,6 +485,12 @@ config BUSYBOX_SHA256SUM
> help
> Compute and check SHA256 message digest
>
> +config BUSYBOX_SHA384SUM
> + bool "sha384sum (7.3 kb)"
> + default y
> + help
> + Compute and check SHA384 message digest
> +
> config BUSYBOX_SHA512SUM
> bool "sha512sum (7.3 kb)"
> default y
> @@ -497,13 +503,13 @@ config BUSYBOX_SHA3SUM
> help
> Compute and check SHA3 message digest
>
> -comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
> - depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
> +comment "Common options for md5sum, sha1sum, sha256sum, ..., sha3sum"
> + depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA384SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
>
> config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
> bool "Enable -c, -s and -w options"
> default y
> - depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
> + depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA384SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
> help
> Enabling the -c options allows files to be checked
> against pre-calculated hash values.
> @@ -875,7 +881,7 @@ config BUSYBOX_UNAME_OSNAME
> depends on BUSYBOX_UNAME
> help
> Sets the operating system name reported by uname -o. The
> - default is "
> + default is "GNU/Linux".
>
> config BUSYBOX_BB_ARCH
> bool "arch (1.4 kb)"
> diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
> index 66c135ec6199..73aa9805e428 100644
> --- a/config/busybox/libbb/Config.in
> +++ b/config/busybox/libbb/Config.in
> @@ -238,8 +238,8 @@ config BUSYBOX_FEATURE_EDITING_VI
> config BUSYBOX_FEATURE_EDITING_HISTORY
> int "History size"
> # Don't allow way too big values here, code uses fixed "char *history[N]" struct member
> - range 0 9999
> - default 255
> + range 0 2000
> + default 200
> depends on BUSYBOX_FEATURE_EDITING
> help
> Specify command history size (0 - disable).
> diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in
> index 5a406110fb4d..6cf60ed2245b 100644
> --- a/config/busybox/loginutils/Config.in
> +++ b/config/busybox/loginutils/Config.in
> @@ -92,6 +92,17 @@ config BUSYBOX_USE_BB_CRYPT_SHA
> With this option off, login will fail password check for any
> user which has password encrypted with these algorithms.
>
> +config BUSYBOX_USE_BB_CRYPT_YES
> + bool "Enable yescrypt functions"
> + default y
> + depends on BUSYBOX_USE_BB_CRYPT
> + help
> + Enable this if you have passwords starting with "$y$" or
> + in your /etc/passwd or /etc/shadow files. These passwords
> + are hashed using yescrypt algorithms.
> + With this option off, login will fail password check for any
> + user which has password encrypted with these algorithms.
> +
> config BUSYBOX_ADD_SHELL
> bool "add-shell (3.3 kb)"
> default y if BUSYBOX_DESKTOP
> @@ -171,7 +182,7 @@ config BUSYBOX_FEATURE_DEFAULT_PASSWD_ALGO
> default "des"
> depends on BUSYBOX_PASSWD || BUSYBOX_CRYPTPW || BUSYBOX_CHPASSWD
> help
> - Possible choices are "d[es]", "m[d5]", "s[ha256]" or "sha512".
> + Possible choices: "d[es]", "m[d5]", "s[ha256]", "sha512", "yescrypt"
> config BUSYBOX_CRYPTPW
> bool "cryptpw (15 kb)"
> default y
> diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
> index e6af8b7b26ce..c5f6e8880ebd 100644
> --- a/config/busybox/networking/Config.in
> +++ b/config/busybox/networking/Config.in
> @@ -876,6 +876,13 @@ config BUSYBOX_SSL_CLIENT
> select BUSYBOX_TLS
> help
> This tool pipes data to/from a socket, TLS-encrypting it.
> +config BUSYBOX_SSL_SERVER
> + bool "ssl_server (test TLS server)"
> + default y
> + select BUSYBOX_TLS
> + help
> + inetd-style TLS server. Stdin/stdout are already connected
> + to an accepted TCP socket.
> config BUSYBOX_TC
> bool "tc (8.3 kb)"
> default y
> @@ -970,6 +977,14 @@ config BUSYBOX_TELNETD
>
> with all that done, telnetd _should_ work....
>
> +config BUSYBOX_FEATURE_TELNETD_SELFTEST_DEBUG
> + bool "Include self-test (telnetd -@)"
> + default n
> + depends on BUSYBOX_TELNETD
> + help
> + Include self-test code for pty/vhangup() behavior.
> + Useful for development and validation on new platforms.
> +
> config BUSYBOX_FEATURE_TELNETD_STANDALONE
> bool "Support standalone telnetd (not inetd only)"
> default y
> diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
> index 9af81b44e4a8..98c8f8bfb2f8 100644
> --- a/config/busybox/procps/Config.in
> +++ b/config/busybox/procps/Config.in
> @@ -267,6 +267,11 @@ config BUSYBOX_FEATURE_UPTIME_UTMP_SUPPORT
> depends on BUSYBOX_UPTIME && BUSYBOX_FEATURE_UTMP
> help
> Display the number of users currently logged on.
> +config BUSYBOX_VMSTAT
> + bool "vmstat (2 kb)"
> + default y
> + help
> + Report virtual memory statistics
> config BUSYBOX_WATCH
> bool "watch (5.2 kb)"
> default y
> diff --git a/config/busybox/runit/Config.in b/config/busybox/runit/Config.in
> index 144787952377..2d63d1b0f994 100644
> --- a/config/busybox/runit/Config.in
> +++ b/config/busybox/runit/Config.in
> @@ -17,7 +17,8 @@ config BUSYBOX_SETUIDGID
> bool "setuidgid (4.2 kb)"
> default y
> help
> - Sets soft resource limits as specified by options
> + Sets UID and GID to those of the given account, and execs
> + specified program.
>
> config BUSYBOX_ENVUIDGID
> bool "envuidgid (4.1 kb)"
> diff --git a/config/busybox/shell/Config.in b/config/busybox/shell/Config.in
> index 2b920033d78a..9733c9d5f666 100644
> --- a/config/busybox/shell/Config.in
> +++ b/config/busybox/shell/Config.in
> @@ -143,6 +143,11 @@ config BUSYBOX_ASH_JOB_CONTROL
> bool "Job control"
> default y
> depends on BUSYBOX_SHELL_ASH
> + help
> + Enable 'fg', 'bg', 'jobs' and 'kill' builtins.
> + Shell will track whether backgrounded pipes are stopped
> + by signals, and allow to restart them by 'fg' or 'bg'.
> + Otherwise, it will only track whether they have terminated.
>
> config BUSYBOX_ASH_ALIAS
> bool "Alias support"
> @@ -276,7 +281,7 @@ config BUSYBOX_HUSH
>
> It will compile and work on no-mmu systems.
>
> - It does not handle select, aliases, tilde expansion,
> + It does not handle select, tilde expansion,
> &>file and >&file redirection of stdout+stderr.
>
> config BUSYBOX_SHELL_HUSH
> @@ -287,6 +292,11 @@ config BUSYBOX_SHELL_HUSH
> # It's only needed to get "nice" menuconfig indenting.
> if BUSYBOX_SHELL_HUSH || BUSYBOX_HUSH || BUSYBOX_SH_IS_HUSH || BUSYBOX_BASH_IS_HUSH
>
> +config BUSYBOX_HUSH_NEED_FOR_SPEED
> + bool "Faster, but larger code"
> + default y
> + depends on BUSYBOX_SHELL_HUSH
> +
> config BUSYBOX_HUSH_BASH_COMPAT
> bool "bash-compatible extensions"
> default y
> @@ -361,6 +371,13 @@ config BUSYBOX_HUSH_CASE
> help
> Enable case ... esac statement. +400 bytes.
>
> +config BUSYBOX_HUSH_ALIAS
> + bool "Support aliases"
> + default y
> + depends on BUSYBOX_SHELL_HUSH
> + help
> + Enable aliases.
> +
> config BUSYBOX_HUSH_FUNCTIONS
> bool "Support funcname() { commands; } syntax"
> default y
> @@ -368,6 +385,13 @@ config BUSYBOX_HUSH_FUNCTIONS
> help
> Enable support for shell functions. +800 bytes.
>
> +config BUSYBOX_HUSH_FUNCTION_KEYWORD
> + bool "Support function keyword"
> + default y
> + depends on BUSYBOX_HUSH_FUNCTIONS
> + help
> + Support "function FUNCNAME { CMD; }" syntax.
> +
> config BUSYBOX_HUSH_LOCAL
> bool "local builtin"
> default y
> @@ -580,9 +604,10 @@ config BUSYBOX_FEATURE_SH_HISTFILESIZE
> default y
> depends on BUSYBOX_SHELL_ASH || BUSYBOX_SHELL_HUSH
> help
> - This option makes busybox shells to use $HISTFILESIZE variable
> - to set shell history size. Note that its max value is capped
> - by "History size" setting in library tuning section.
> + This option makes busybox shells to use $HISTSIZE and
> + $HISTFILESIZE variables to set shell history size.
> + Note that its max value is capped by "History size" setting
> + in library tuning section.
>
> config BUSYBOX_FEATURE_SH_EMBEDDED_SCRIPTS
> bool "Embed scripts in the binary"
> diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
> index 8008c5c0dc84..1e0e1f113bdd 100644
> --- a/config/busybox/util-linux/Config.in
> +++ b/config/busybox/util-linux/Config.in
> @@ -161,7 +161,12 @@ config BUSYBOX_FDISK_SUPPORT_LARGE_DISKS
> bool "Support over 4GB disks"
> default y
> depends on BUSYBOX_FDISK
> - depends on !BUSYBOX_LFS # with LFS no special code is needed
> + depends on !BUSYBOX_LFS # with BUSYBOX_LFS no special code is needed
> +
> +config BUSYBOX_FEATURE_FDISK_BLKSIZE
> + bool "Support -s option to list sizes"
> + default y
> + depends on BUSYBOX_FDISK
>
> config BUSYBOX_FEATURE_FDISK_WRITABLE
> bool "Write support"
> @@ -371,6 +376,11 @@ config BUSYBOX_LOSETUP
> losetup is used to associate or detach a loop device with a regular
> file or block device, and to query the status of a loop device. This
> version does not currently support enabling data encryption.
> +config BUSYBOX_LSBLK
> + bool "lsblk (2.5 kb)"
> + default y
> + help
> + List information about all available or specified block devices.
> config BUSYBOX_LSPCI
> bool "lspci (6.4 kb)"
> default y
> @@ -888,6 +898,11 @@ config BUSYBOX_UNSHARE
> select BUSYBOX_LONG_OPTS
> help
> Run program with some namespaces unshared from parent.
> +config BUSYBOX_UUIDGEN
> + bool "uuidgen (1.1 kb)"
> + default y
> + help
> + Generate a UUID (Universally Unique Identifier) in RFC 4122 format.
> config BUSYBOX_WALL
> bool "wall (2.9 kb)"
> default y
> diff --git a/patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch b/patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch
> deleted file mode 100644
> index d9864d8d79c0..000000000000
> --- a/patches/busybox-1.37.0/0204-lineedit-fix-printing-lines-during-tab-completion.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From c443f2d2c67b5e5080632819980799c55b7bb89f Mon Sep 17 00:00:00 2001
> -From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> -Date: Thu, 17 Apr 2025 11:00:43 +0200
> -Subject: [PATCH 1/2] lineedit: fix printing lines during tab completion
> -
> -Indentation and escape characters are all output to stderr now, but the
> -matches themself remained on stdout leading to garbled output on Tab
> -completion.
> -
> -Print the results to stderr as well to fix this.
> -
> -Fixes: fd47f056765a ("lineedit: print prompt and editing operations to stderr")
> -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ----
> - libbb/lineedit.c | 5 +++--
> - 1 file changed, 3 insertions(+), 2 deletions(-)
> -
> -diff --git a/libbb/lineedit.c b/libbb/lineedit.c
> -index 543a3f11c3e4..1f4b011008b6 100644
> ---- a/libbb/lineedit.c
> -+++ b/libbb/lineedit.c
> -@@ -1170,9 +1170,10 @@ static void showfiles(void)
> - );
> - }
> - if (ENABLE_UNICODE_SUPPORT)
> -- puts(printable_string(matches[n]));
> -+ fputs(printable_string(matches[n]), stderr);
> - else
> -- puts(matches[n]);
> -+ fputs(matches[n], stderr);
> -+ bb_putchar_stderr('\n');
> - }
> - }
> -
> ---
> -2.39.5
> -
> diff --git a/patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch b/patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch
> deleted file mode 100644
> index 6c0d00e18b59..000000000000
> --- a/patches/busybox-1.37.0/0205-lineedit-fix-left-over-print-to-stdout.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -From 40a8532dea18363fb67466e1b02651cc964017e8 Mon Sep 17 00:00:00 2001
> -From: Ahmad Fatoum <a.fatoum@pengutronix.de>
> -Date: Thu, 17 Apr 2025 11:00:43 +0200
> -Subject: [PATCH 2/2] lineedit: fix left-over print to stdout
> -
> -There's code printing to stderr both before and after the single call to
> -puts inside put_cur_glyph_and_inc_cursor().
> -
> -This is likely an oversight as we want everything to go through the
> -same file descriptor, so switch it over to fputs.
> -
> -Fixes: fd47f056765a ("lineedit: print prompt and editing operations to stderr")
> -Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ----
> - libbb/lineedit.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/libbb/lineedit.c b/libbb/lineedit.c
> -index 1f4b011008b6..206fc36ef5c0 100644
> ---- a/libbb/lineedit.c
> -+++ b/libbb/lineedit.c
> -@@ -451,7 +451,7 @@ static void put_cur_glyph_and_inc_cursor(void)
> - * have automargin (IOW: it is moving cursor to next line
> - * by itself (which is wrong for VT-10x terminals)),
> - * this will break things: there will be one extra empty line */
> -- puts("\r"); /* + implicit '\n' */
> -+ fputs("\r\n", stderr);
> - #else
> - /* VT-10x terminals don't wrap cursor to next line when last char
> - * on the line is printed - cursor stays "over" this char.
> ---
> -2.39.5
> -
> diff --git a/patches/busybox-1.37.0/0200-reactivate-check-for-tty.patch b/patches/busybox-1.38.0/0200-reactivate-check-for-tty.patch
> similarity index 100%
> rename from patches/busybox-1.37.0/0200-reactivate-check-for-tty.patch
> rename to patches/busybox-1.38.0/0200-reactivate-check-for-tty.patch
> diff --git a/patches/busybox-1.37.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.38.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
> similarity index 100%
> rename from patches/busybox-1.37.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
> rename to patches/busybox-1.38.0/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
> diff --git a/patches/busybox-1.37.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.38.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
> similarity index 100%
> rename from patches/busybox-1.37.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
> rename to patches/busybox-1.38.0/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
> diff --git a/patches/busybox-1.37.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch b/patches/busybox-1.38.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> similarity index 100%
> rename from patches/busybox-1.37.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> rename to patches/busybox-1.38.0/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> diff --git a/patches/busybox-1.37.0/series b/patches/busybox-1.38.0/series
> similarity index 68%
> rename from patches/busybox-1.37.0/series
> rename to patches/busybox-1.38.0/series
> index f403c5683e27..87fee50916c0 100644
> --- a/patches/busybox-1.37.0/series
> +++ b/patches/busybox-1.38.0/series
> @@ -7,6 +7,4 @@
> 0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
> 0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
> 0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> -0204-lineedit-fix-printing-lines-during-tab-completion.patch
> -0205-lineedit-fix-left-over-print-to-stdout.patch
> -# de06cc1132910215a67ae025e9b0aaa9 - git-ptx-patches magic
> +# e781b8c6838e27fd021f9c1a9f87654d - git-ptx-patches magic
> diff --git a/rules/busybox.make b/rules/busybox.make
> index bb7d58daf490..c92a370a8bcb 100644
> --- a/rules/busybox.make
> +++ b/rules/busybox.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox
> #
> # Paths and names
> #
> -BUSYBOX_VERSION := 1.37.0
> -BUSYBOX_SHA256 := 3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4
> +BUSYBOX_VERSION := 1.38.0
> +BUSYBOX_SHA256 := 34f9ea6ff8636f2c9241153b9114eefa9e65674a45318ae1ef95bb5f31c53bb2
> BUSYBOX := busybox-$(BUSYBOX_VERSION)
> BUSYBOX_SUFFIX := tar.bz2
> BUSYBOX_URL := https://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)
> diff --git a/rules/coreutils.in b/rules/coreutils.in
> index c8ba498fbce4..50428373610c 100644
> --- a/rules/coreutils.in
> +++ b/rules/coreutils.in
> @@ -206,6 +206,10 @@ comment "busybox' tty is selected!"
> config COREUTILS_SHA384SUM
> bool
> prompt "sha384sum"
> + depends on !BUSYBOX_SHA384SUM || ALLYES
> +
> +comment "busybox' sha384sum is selected!"
> + depends on BUSYBOX_SHA384SUM
>
> config COREUTILS_CUT
> bool
> diff --git a/rules/procps.in b/rules/procps.in
> index 1d8c9e35c413..fc0acb12de50 100644
> --- a/rules/procps.in
> +++ b/rules/procps.in
> @@ -160,10 +160,14 @@ comment "busybox' uptime is selected!"
> config PROCPS_VMSTAT
> bool
> prompt "vmstat"
> + depends on !BUSYBOX_VMSTAT || ALLYES
> help
> vmstat reports information about processes, memory,
> paging, block IO, traps, disks and cpu activity.
>
> +comment "busybox' vmstat is selected!"
> + depends on BUSYBOX_VMSTAT
> +
> config PROCPS_W
> bool
> prompt "w"
> diff --git a/rules/util-linux.in b/rules/util-linux.in
> index ff68e5377141..f997b188a591 100644
> --- a/rules/util-linux.in
> +++ b/rules/util-linux.in
> @@ -248,10 +248,14 @@ config UTIL_LINUX_LSBLK
> select UTIL_LINUX_LIBSMARTCOLS
> select UTIL_LINUX_LIBTCOLORS
> prompt "lsblk"
> + depends on !BUSYBOX_LSBLK || ALLYES
> help
> The lsblk command lists information about all available or the
> specified block devices.
>
> +comment "BusyBox' lsblk is selected!"
> + depends on BUSYBOX_LSBLK
> +
> config UTIL_LINUX_MCOOKIE
> bool
> prompt "mcookie"
> @@ -273,9 +277,13 @@ config UTIL_LINUX_UUIDGEN
> bool
> select UTIL_LINUX_LIBUUID
> prompt "uuidgen"
> + depends on !BUSYBOX_UUIDGEN || ALLYES
> help
> uuidgen is a command-line utility to create a new UUID value.
>
> +comment "BusyBox' uuidgen is selected!"
> + depends on BUSYBOX_UUIDGEN
> +
> config UTIL_LINUX_WAITPID
> bool
> prompt "waitpid"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-06-25 19:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-30 8:19 [ptxdist] [PATCH] busybox: version bump 1.37.0 -> 1.38.0 Ladislav Michl
2026-06-25 19:23 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox