Skip to content

Commit

Permalink
busybox: update to 1.37.0
Browse files Browse the repository at this point in the history
Add a patch to fix non-x86 builds, refresh the configuration and patches.

Signed-off-by: Rui Salvaterra <[email protected]>
  • Loading branch information
rsalvaterra committed Sep 27, 2024
1 parent a4c95f1 commit 578d6d3
Show file tree
Hide file tree
Showing 29 changed files with 403 additions and 345 deletions.
21 changes: 16 additions & 5 deletions package/utils/busybox/Config-defaults.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ config BUSYBOX_DEFAULT_FEATURE_COMPRESS_USAGE
config BUSYBOX_DEFAULT_LFS
bool
default y
config BUSYBOX_DEFAULT_TIME64
bool
default n
config BUSYBOX_DEFAULT_PAM
bool
default n
Expand Down Expand Up @@ -1181,6 +1184,9 @@ config BUSYBOX_DEFAULT_FEATURE_FIND_EXEC
config BUSYBOX_DEFAULT_FEATURE_FIND_EXEC_PLUS
bool
default n
config BUSYBOX_DEFAULT_FEATURE_FIND_EXEC_OK
bool
default n
config BUSYBOX_DEFAULT_FEATURE_FIND_USER
bool
default y
Expand Down Expand Up @@ -1333,7 +1339,7 @@ config BUSYBOX_DEFAULT_USE_BB_CRYPT
default n
config BUSYBOX_DEFAULT_USE_BB_CRYPT_SHA
bool
default y
default n
config BUSYBOX_DEFAULT_ADD_SHELL
bool
default n
Expand Down Expand Up @@ -2051,6 +2057,9 @@ config BUSYBOX_DEFAULT_FLASH_UNLOCK
config BUSYBOX_DEFAULT_FLASHCP
bool
default n
config BUSYBOX_DEFAULT_GETFATTR
bool
default n
config BUSYBOX_DEFAULT_HDPARM
bool
default n
Expand Down Expand Up @@ -2240,7 +2249,6 @@ config BUSYBOX_DEFAULT_FEATURE_WATCHDOG_OPEN_TWICE
config BUSYBOX_DEFAULT_FEATURE_IPV6
bool
default y if IPV6
default n
config BUSYBOX_DEFAULT_FEATURE_UNIX_LOCAL
bool
default n
Expand Down Expand Up @@ -2457,6 +2465,9 @@ config BUSYBOX_DEFAULT_FEATURE_IP_ADDRESS
config BUSYBOX_DEFAULT_FEATURE_IP_LINK
bool
default y
config BUSYBOX_DEFAULT_FEATURE_IP_LINK_CAN
bool
default n
config BUSYBOX_DEFAULT_FEATURE_IP_ROUTE
bool
default y
Expand Down Expand Up @@ -2682,6 +2693,9 @@ config BUSYBOX_DEFAULT_ZCIP
config BUSYBOX_DEFAULT_UDHCPD
bool
default n
config BUSYBOX_DEFAULT_FEATURE_UDHCPD_BOOTP
bool
default n
config BUSYBOX_DEFAULT_FEATURE_UDHCPD_BASE_IP_ON_MAC
bool
default n
Expand Down Expand Up @@ -3042,9 +3056,6 @@ config BUSYBOX_DEFAULT_ASH_PRINTF
config BUSYBOX_DEFAULT_ASH_TEST
bool
default y
config BUSYBOX_DEFAULT_ASH_SLEEP
bool
default n
config BUSYBOX_DEFAULT_ASH_HELP
bool
default n
Expand Down
6 changes: 3 additions & 3 deletions package/utils/busybox/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=busybox
PKG_VERSION:=1.36.1
PKG_RELEASE:=2
PKG_VERSION:=1.37.0
PKG_RELEASE:=1
PKG_FLAGS:=essential

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.busybox.net/downloads \
http://sources.buildroot.net
PKG_HASH:=b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314
PKG_HASH:=3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4

PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam
PKG_BUILD_PARALLEL:=1
Expand Down
11 changes: 11 additions & 0 deletions package/utils/busybox/config/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,17 @@ config BUSYBOX_CONFIG_LFS
programs that can benefit from large file support include dd, gzip,
cp, mount, tar.

config BUSYBOX_CONFIG_TIME64
bool "Support 64bit wide time types"
default BUSYBOX_DEFAULT_TIME64
depends on BUSYBOX_CONFIG_LFS
help
Make times later than 2038 representable for several libc syscalls
(stat, clk_gettime etc.). Note this switch is specific to glibc
and has no effect on platforms that already use 64bit wide time types
(i.e. all 64bit archs and some selected 32bit archs (currently riscv
and x32)).

config BUSYBOX_CONFIG_PAM
bool "Support PAM (Pluggable Authentication Modules)"
default BUSYBOX_DEFAULT_PAM
Expand Down
12 changes: 6 additions & 6 deletions package/utils/busybox/config/archival/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ config BUSYBOX_CONFIG_FEATURE_GUNZIP_LONG_OPTIONS
default BUSYBOX_DEFAULT_FEATURE_GUNZIP_LONG_OPTIONS
depends on (BUSYBOX_CONFIG_GUNZIP || BUSYBOX_CONFIG_ZCAT) && BUSYBOX_CONFIG_LONG_OPTS
config BUSYBOX_CONFIG_BUNZIP2
bool "bunzip2 (8.7 kb)"
bool "bunzip2 (9.1 kb)"
default BUSYBOX_DEFAULT_BUNZIP2
select BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS
help
Expand All @@ -94,13 +94,13 @@ config BUSYBOX_CONFIG_BUNZIP2
should probably say N here.

config BUSYBOX_CONFIG_BZCAT
bool "bzcat (8.7 kb)"
bool "bzcat (9 kb)"
default BUSYBOX_DEFAULT_BZCAT
select BUSYBOX_CONFIG_FEATURE_BZIP2_DECOMPRESS
help
Alias to "bunzip2 -c".
config BUSYBOX_CONFIG_UNLZMA
bool "unlzma (7.5 kb)"
bool "unlzma (7.8 kb)"
default BUSYBOX_DEFAULT_UNLZMA
help
unlzma is a compression utility using the Lempel-Ziv-Markov chain
Expand All @@ -109,7 +109,7 @@ config BUSYBOX_CONFIG_UNLZMA
compressors.

config BUSYBOX_CONFIG_LZCAT
bool "lzcat (7.5 kb)"
bool "lzcat (7.8 kb)"
default BUSYBOX_DEFAULT_LZCAT
help
Alias to "unlzma -c".
Expand Down Expand Up @@ -229,7 +229,7 @@ config BUSYBOX_CONFIG_DPKG
This implementation of dpkg has a number of limitations,
you should use the official dpkg if possible.
config BUSYBOX_CONFIG_DPKG_DEB
bool "dpkg-deb (30 kb)"
bool "dpkg-deb (29 kb)"
default BUSYBOX_DEFAULT_DPKG_DEB
select BUSYBOX_CONFIG_FEATURE_SEAMLESS_GZ
help
Expand Down Expand Up @@ -282,7 +282,7 @@ config BUSYBOX_CONFIG_FEATURE_GZIP_DECOMPRESS
This will be automatically selected if gunzip or zcat is
enabled.
config BUSYBOX_CONFIG_LZOP
bool "lzop (12 kb)"
bool "lzop (13 kb)"
default BUSYBOX_DEFAULT_LZOP
help
Lzop compression/decompresion.
Expand Down
30 changes: 15 additions & 15 deletions package/utils/busybox/config/console-tools/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,39 +7,39 @@
menu "Console Utilities"

config BUSYBOX_CONFIG_CHVT
bool "chvt (2 kb)"
bool "chvt (2.2 kb)"
default BUSYBOX_DEFAULT_CHVT
help
This program is used to change to another terminal.
Example: chvt 4 (change to terminal /dev/tty4)
config BUSYBOX_CONFIG_CLEAR
bool "clear (tiny)"
bool "clear (371 bytes)"
default BUSYBOX_DEFAULT_CLEAR
help
This program clears the terminal screen.
config BUSYBOX_CONFIG_DEALLOCVT
bool "deallocvt (1.9 kb)"
bool "deallocvt (2.2 kb)"
default BUSYBOX_DEFAULT_DEALLOCVT
help
This program deallocates unused virtual consoles.
config BUSYBOX_CONFIG_DUMPKMAP
bool "dumpkmap (1.6 kb)"
bool "dumpkmap (1.9 kb)"
default BUSYBOX_DEFAULT_DUMPKMAP
help
This program dumps the kernel's keyboard translation table to
stdout, in binary format. You can then use loadkmap to load it.
config BUSYBOX_CONFIG_FGCONSOLE
bool "fgconsole (1.5 kb)"
bool "fgconsole (1.8 kb)"
default BUSYBOX_DEFAULT_FGCONSOLE
help
This program prints active (foreground) console number.
config BUSYBOX_CONFIG_KBD_MODE
bool "kbd_mode (4.1 kb)"
bool "kbd_mode (4.3 kb)"
default BUSYBOX_DEFAULT_KBD_MODE
help
This program reports and sets keyboard mode.
config BUSYBOX_CONFIG_LOADFONT
bool "loadfont (5.2 kb)"
bool "loadfont (5.4 kb)"
default BUSYBOX_DEFAULT_LOADFONT
help
This program loads a console font from standard input.
Expand Down Expand Up @@ -78,25 +78,25 @@ config BUSYBOX_CONFIG_FEATURE_LOADFONT_RAW
default BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW
depends on BUSYBOX_CONFIG_LOADFONT || BUSYBOX_CONFIG_SETFONT
config BUSYBOX_CONFIG_LOADKMAP
bool "loadkmap (1.8 kb)"
bool "loadkmap (2.1 kb)"
default BUSYBOX_DEFAULT_LOADKMAP
help
This program loads a keyboard translation table from
standard input.
config BUSYBOX_CONFIG_OPENVT
bool "openvt (7.2 kb)"
bool "openvt (7.4 kb)"
default BUSYBOX_DEFAULT_OPENVT
help
This program is used to start a command on an unused
virtual terminal.
config BUSYBOX_CONFIG_RESET
bool "reset (345 bytes)"
bool "reset (676 bytes)"
default BUSYBOX_DEFAULT_RESET
help
This program is used to reset the terminal screen, if it
gets messed up.
config BUSYBOX_CONFIG_RESIZE
bool "resize (903 bytes)"
bool "resize (1.2 kb)"
default BUSYBOX_DEFAULT_RESIZE
help
This program is used to (re)set the width and height of your current
Expand All @@ -112,7 +112,7 @@ config BUSYBOX_CONFIG_FEATURE_RESIZE_PRINT
E.g.:
COLUMNS=80;LINES=44;export COLUMNS LINES;
config BUSYBOX_CONFIG_SETCONSOLE
bool "setconsole (3.6 kb)"
bool "setconsole (3.8 kb)"
default BUSYBOX_DEFAULT_SETCONSOLE
help
Redirect writes to /dev/console to another device,
Expand All @@ -125,18 +125,18 @@ config BUSYBOX_CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS
default BUSYBOX_DEFAULT_FEATURE_SETCONSOLE_LONG_OPTIONS
depends on BUSYBOX_CONFIG_SETCONSOLE && BUSYBOX_CONFIG_LONG_OPTS
config BUSYBOX_CONFIG_SETKEYCODES
bool "setkeycodes (2.1 kb)"
bool "setkeycodes (2.4 kb)"
default BUSYBOX_DEFAULT_SETKEYCODES
help
This program loads entries into the kernel's scancode-to-keycode
map, allowing unusual keyboards to generate usable keycodes.
config BUSYBOX_CONFIG_SETLOGCONS
bool "setlogcons (1.8 kb)"
bool "setlogcons (2 kb)"
default BUSYBOX_DEFAULT_SETLOGCONS
help
This program redirects the output console of kernel messages.
config BUSYBOX_CONFIG_SHOWKEY
bool "showkey (4.7 kb)"
bool "showkey (4.9 kb)"
default BUSYBOX_DEFAULT_SHOWKEY
help
Shows keys pressed.
Expand Down
Loading

0 comments on commit 578d6d3

Please sign in to comment.