bump version busybox-1.31.1

diff --git a/archive-patches/busybox-1.29.1-changing-the-order-sys-tree.diff b/archive-patches/busybox-1.29.1-changing-the-order-sys-tree.diff
index 822844f7525686cccdfaff479d31b6ff147864be..3e85ec520d639abc44bd1a85531b3cf9d1d695a8 100644 (file)
--- a/archive-patches/busybox-1.29.1-changing-the-order-sys-tree.diff
+++ b/archive-patches/busybox-1.29.1-changing-the-order-sys-tree.diff
@@ -20,14 +20,14 @@ CONFIG_SYSFS_DEPRECATED and CONFIG_SYSFS_DEPRECATED_V2 are set.
 
 --- a/util-linux/mdev.c
 +++ b/util-linux/mdev.c
-@@ -1074,6 +1074,10 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
+@@ -1141,6 +1141,10 @@
  
-               putenv((char*)"ACTION=add");
+       putenv((char*)"ACTION=add");
  
-+              recursive_action("/sys/class",
-+                              ACTION_RECURSE | ACTION_FOLLOWLINKS,
-+                              fileAction, dirAction, temp, 0);
++      recursive_action("/sys/class",
++                       ACTION_RECURSE | ACTION_FOLLOWLINKS,
++                       fileAction, dirAction, temp, 0);
 +
-               /* Create all devices from /sys/dev hierarchy */
-               recursive_action("/sys/dev",
-                                ACTION_RECURSE | ACTION_FOLLOWLINKS,
+       /* Create all devices from /sys/dev hierarchy */
+       recursive_action("/sys/dev",
+                        ACTION_RECURSE | ACTION_FOLLOWLINKS,

diff --git a/archive-patches/busybox-1.30.1-arm.config b/archive-patches/busybox-1.30.1-arm.config
index 30ebeb5c7c2c184950c967beaef4fdd3149bb1dc..31bd674f62d891252dff51ddae5148c1618c4296 100644 (file)
--- a/archive-patches/busybox-1.30.1-arm.config
+++ b/archive-patches/busybox-1.30.1-arm.config
@@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_SELINUX is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
 CONFIG_PLATFORM_LINUX=y
 
@@ -236,7 +237,6 @@ CONFIG_EXPR=y
 # CONFIG_FACTOR is not set
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
 CONFIG_HEAD=y
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
@@ -303,6 +303,7 @@ CONFIG_STTY=y
 # CONFIG_SUM is not set
 CONFIG_SYNC=y
 # CONFIG_FEATURE_SYNC_FANCY is not set
+# CONFIG_FSYNC is not set
 # CONFIG_TAC is not set
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -635,6 +636,7 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_FEATURE_MDEV_DAEMON=y
 CONFIG_MESG=y
 CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 # CONFIG_MKE2FS is not set
@@ -782,6 +784,7 @@ CONFIG_HEXEDIT=y
 # CONFIG_I2CSET is not set
 # CONFIG_I2CDUMP is not set
 # CONFIG_I2CDETECT is not set
+# CONFIG_I2CTRANSFER is not set
 # CONFIG_INOTIFYD is not set
 # CONFIG_LESS is not set
 CONFIG_FEATURE_LESS_MAXLINES=0
@@ -815,6 +818,7 @@ CONFIG_SETFATTR=y
 CONFIG_SETSERIAL=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
+# CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIRENAME is not set
 # CONFIG_UBIATTACH is not set
@@ -942,6 +946,7 @@ CONFIG_TELNETD=y
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
 # CONFIG_TFTPD is not set
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
@@ -1150,8 +1155,9 @@ CONFIG_CTTYHACK=y
 # Options common to all shells
 #
 CONFIG_FEATURE_SH_MATH=y
-# CONFIG_FEATURE_SH_MATH_64 is not set
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
 CONFIG_FEATURE_SH_READ_FRAC=y

diff --git a/archive-patches/busybox-1.30.1-cst.config b/archive-patches/busybox-1.30.1-cst.config
index 7b3dc6a1de3d56c5e169dc123b96967ba3bbf08a..a9a66e628d9b68db5b7813132945d1add84b1ab9 100644 (file)
--- a/archive-patches/busybox-1.30.1-cst.config
+++ b/archive-patches/busybox-1.30.1-cst.config
@@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_SELINUX is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
 CONFIG_PLATFORM_LINUX=y
 
@@ -236,7 +237,6 @@ CONFIG_EXPR=y
 # CONFIG_FACTOR is not set
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
 CONFIG_HEAD=y
 # CONFIG_FEATURE_FANCY_HEAD is not set
 # CONFIG_HOSTID is not set
@@ -303,6 +303,7 @@ CONFIG_STTY=y
 # CONFIG_SUM is not set
 CONFIG_SYNC=y
 # CONFIG_FEATURE_SYNC_FANCY is not set
+# CONFIG_FSYNC is not set
 # CONFIG_TAC is not set
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -635,6 +636,7 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_FEATURE_MDEV_DAEMON=y
 CONFIG_MESG=y
 CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 # CONFIG_MKE2FS is not set
@@ -782,6 +784,7 @@ CONFIG_HEXEDIT=y
 # CONFIG_I2CSET is not set
 # CONFIG_I2CDUMP is not set
 # CONFIG_I2CDETECT is not set
+# CONFIG_I2CTRANSFER is not set
 # CONFIG_INOTIFYD is not set
 # CONFIG_LESS is not set
 CONFIG_FEATURE_LESS_MAXLINES=0
@@ -815,6 +818,7 @@ CONFIG_SETFATTR=y
 CONFIG_SETSERIAL=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
+# CONFIG_TS is not set
 # CONFIG_TTYSIZE is not set
 # CONFIG_UBIRENAME is not set
 # CONFIG_UBIATTACH is not set
@@ -942,6 +946,7 @@ CONFIG_TELNETD=y
 # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
 # CONFIG_TFTP is not set
 # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
+# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set
 # CONFIG_TFTPD is not set
 # CONFIG_FEATURE_TFTP_GET is not set
 # CONFIG_FEATURE_TFTP_PUT is not set
@@ -1150,8 +1155,9 @@ CONFIG_CTTYHACK=y
 # Options common to all shells
 #
 CONFIG_FEATURE_SH_MATH=y
-# CONFIG_FEATURE_SH_MATH_64 is not set
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
 CONFIG_FEATURE_SH_READ_FRAC=y

diff --git a/make/applications.mk b/make/applications.mk
index fc943034b21be3d65599da371e8791a2fb994dec..e8f6ef39fd9c5569a62f05942fe0190c1fbf50de 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -58,7 +58,7 @@ BUSYBOX_MAKE_OPTS = \
 BUSYBOX_PATCHES  = busybox-1.29.1-hack-init-s-console.patch
 BUSYBOX_PATCHES += busybox-1.29.1-changing-the-order-sys-tree.diff
 BUSYBOX_PATCHES += busybox-1.29.1-mdev.diff
-BUSYBOX_PATCHES += busybox-1.29.1-unicode.patch
+#BUSYBOX_PATCHES += busybox-1.29.1-unicode.patch
 BUSYBOX_PATCHES += busybox-1.29.1-flashcp-small-output.patch
 BUSYBOX_PATCHES += busybox-mount_single_uuid.patch
 

diff --git a/make/versions.mk b/make/versions.mk
index 6d3b8d0baf671c12e77ab3b61e828aba436b6dbd..355b1aeb5fded36336ba7e17a2f92dba3735ab04 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -10,7 +10,7 @@ AUTOFS5_MINOR = 1
 AUTOFS5_MICRO = 5
 AUTOFS5_VER = $(AUTOFS5_MAJOR).$(AUTOFS5_MINOR).$(AUTOFS5_MICRO)
 
-BUSYBOX_VER = 1.30.1
+BUSYBOX_VER = 1.31.1
 
 # cortex-strings; optimized string routines for ARM and AArch64
 CORTEX_STRINGS_VER = 48fd30c