Skip to content

Commit e506e98

Browse files
author
Stefano Stabellini
committed
Upgrade busybox to 1.34.1
Signed-off-by: Stefano Stabellini <[email protected]>
1 parent 8c60220 commit e506e98

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

initrd/busybox.config

+18-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
3-
# Busybox version: 1.32.0
4-
# Mon Sep 21 19:33:48 2020
3+
# Busybox version: 1.34.1
4+
# Fri Oct 22 18:18:18 2021
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77

@@ -36,7 +36,6 @@ CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
3636
# CONFIG_FEATURE_CLEAN_UP is not set
3737
CONFIG_FEATURE_SYSLOG_INFO=y
3838
CONFIG_FEATURE_SYSLOG=y
39-
CONFIG_PLATFORM_LINUX=y
4039

4140
#
4241
# Build Options
@@ -55,6 +54,7 @@ CONFIG_EXTRA_LDFLAGS=""
5554
CONFIG_EXTRA_LDLIBS=""
5655
# CONFIG_USE_PORTABLE_CODE is not set
5756
CONFIG_STACK_OPTIMIZATION_386=y
57+
CONFIG_STATIC_LIBGCC=y
5858

5959
#
6060
# Installation Options ("make install" behavior)
@@ -207,11 +207,13 @@ CONFIG_CHOWN=y
207207
CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
208208
CONFIG_CHROOT=y
209209
CONFIG_CKSUM=y
210+
CONFIG_CRC32=y
210211
CONFIG_COMM=y
211212
CONFIG_CP=y
212213
CONFIG_FEATURE_CP_LONG_OPTIONS=y
213214
CONFIG_FEATURE_CP_REFLINK=y
214215
CONFIG_CUT=y
216+
CONFIG_FEATURE_CUT_REGEX=y
215217
CONFIG_DATE=y
216218
CONFIG_FEATURE_DATE_ISOFMT=y
217219
# CONFIG_FEATURE_DATE_NANO is not set
@@ -316,7 +318,6 @@ CONFIG_TEST2=y
316318
CONFIG_FEATURE_TEST_64=y
317319
CONFIG_TIMEOUT=y
318320
CONFIG_TOUCH=y
319-
CONFIG_FEATURE_TOUCH_NODEREF=y
320321
CONFIG_FEATURE_TOUCH_SUSV3=y
321322
CONFIG_TR=y
322323
CONFIG_FEATURE_TR_CLASSES=y
@@ -331,6 +332,7 @@ CONFIG_UNIQ=y
331332
CONFIG_UNLINK=y
332333
CONFIG_USLEEP=y
333334
CONFIG_UUDECODE=y
335+
CONFIG_BASE32=y
334336
CONFIG_BASE64=y
335337
CONFIG_UUENCODE=y
336338
CONFIG_WC=y
@@ -423,6 +425,7 @@ CONFIG_VI=y
423425
CONFIG_FEATURE_VI_MAX_LEN=1024
424426
CONFIG_FEATURE_VI_8BIT=y
425427
CONFIG_FEATURE_VI_COLON=y
428+
CONFIG_FEATURE_VI_COLON_EXPAND=y
426429
CONFIG_FEATURE_VI_YANKMARK=y
427430
CONFIG_FEATURE_VI_SEARCH=y
428431
# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
@@ -436,6 +439,7 @@ CONFIG_FEATURE_VI_ASK_TERMINAL=y
436439
CONFIG_FEATURE_VI_UNDO=y
437440
CONFIG_FEATURE_VI_UNDO_QUEUE=y
438441
CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256
442+
CONFIG_FEATURE_VI_VERBOSE_STATUS=y
439443
CONFIG_FEATURE_ALLOW_EXEC=y
440444

441445
#
@@ -623,7 +627,6 @@ CONFIG_FSTRIM=y
623627
CONFIG_GETOPT=y
624628
CONFIG_FEATURE_GETOPT_LONG=y
625629
CONFIG_HEXDUMP=y
626-
CONFIG_FEATURE_HEXDUMP_REVERSE=y
627630
CONFIG_HD=y
628631
CONFIG_XXD=y
629632
CONFIG_HWCLOCK=y
@@ -715,6 +718,7 @@ CONFIG_VOLUMEID=y
715718
CONFIG_FEATURE_VOLUMEID_BCACHE=y
716719
CONFIG_FEATURE_VOLUMEID_BTRFS=y
717720
CONFIG_FEATURE_VOLUMEID_CRAMFS=y
721+
CONFIG_FEATURE_VOLUMEID_EROFS=y
718722
CONFIG_FEATURE_VOLUMEID_EXFAT=y
719723
CONFIG_FEATURE_VOLUMEID_EXT=y
720724
CONFIG_FEATURE_VOLUMEID_F2FS=y
@@ -742,6 +746,7 @@ CONFIG_FEATURE_VOLUMEID_XFS=y
742746
# Miscellaneous Utilities
743747
#
744748
CONFIG_ADJTIMEX=y
749+
CONFIG_ASCII=y
745750
CONFIG_BBCONFIG=y
746751
CONFIG_FEATURE_COMPRESS_BBCONFIG=y
747752
CONFIG_BC=y
@@ -837,6 +842,7 @@ CONFIG_TTYSIZE=y
837842
# CONFIG_UBIRENAME is not set
838843
CONFIG_VOLNAME=y
839844
CONFIG_WATCHDOG=y
845+
# CONFIG_FEATURE_WATCHDOG_OPEN_TWICE is not set
840846

841847
#
842848
# Networking Utilities
@@ -874,6 +880,10 @@ CONFIG_DNSDOMAINNAME=y
874880
# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
875881
# CONFIG_FEATURE_HTTPD_PROXY is not set
876882
# CONFIG_FEATURE_HTTPD_GZIP is not set
883+
# CONFIG_FEATURE_HTTPD_ETAG is not set
884+
# CONFIG_FEATURE_HTTPD_LAST_MODIFIED is not set
885+
# CONFIG_FEATURE_HTTPD_DATE is not set
886+
# CONFIG_FEATURE_HTTPD_ACL_IP is not set
877887
CONFIG_IFCONFIG=y
878888
CONFIG_FEATURE_IFCONFIG_STATUS=y
879889
CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -971,6 +981,7 @@ CONFIG_VCONFIG=y
971981
CONFIG_WGET=y
972982
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
973983
CONFIG_FEATURE_WGET_STATUSBAR=y
984+
# CONFIG_FEATURE_WGET_FTP is not set
974985
CONFIG_FEATURE_WGET_AUTHENTICATION=y
975986
CONFIG_FEATURE_WGET_TIMEOUT=y
976987
CONFIG_FEATURE_WGET_HTTPS=y
@@ -996,6 +1007,7 @@ CONFIG_FEATURE_UDHCPC6_RFC5970=y
9961007
#
9971008
# Common options for DHCP applets
9981009
#
1010+
CONFIG_UDHCPC_DEFAULT_INTERFACE="eth0"
9991011
# CONFIG_FEATURE_UDHCP_PORT is not set
10001012
CONFIG_UDHCP_DEBUG=0
10011013
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -1127,8 +1139,8 @@ CONFIG_ASH_CMDCMD=y
11271139
# CONFIG_SHELL_HUSH is not set
11281140
# CONFIG_HUSH_BASH_COMPAT is not set
11291141
# CONFIG_HUSH_BRACE_EXPANSION is not set
1130-
# CONFIG_HUSH_LINENO_VAR is not set
11311142
# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
1143+
# CONFIG_HUSH_LINENO_VAR is not set
11321144
# CONFIG_HUSH_INTERACTIVE is not set
11331145
# CONFIG_HUSH_SAVEHISTORY is not set
11341146
# CONFIG_HUSH_JOB is not set

initrd/make-initrd

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rm -rf $tmpdir
1212

1313
if test -z "$busybox"
1414
then
15-
busybox_version=1.32.0
15+
busybox_version=1.34.1
1616
busybox_name=busybox-$busybox_version
1717
busybox_tarball="$busybox_name".tar.bz2
1818
busybox_url="https://busybox.net/downloads/""$busybox_tarball"

0 commit comments

Comments
 (0)