From c01de89fa28183dc86358391efcdff9b8e351bee Mon Sep 17 00:00:00 2001 From: Markham Date: Mon, 29 Jun 2020 10:39:14 +0200 Subject: [PATCH] bumb version busybox-1.32.0 --- ...-1.30.1-arm.config => busybox-1.32.0-arm.config} | 11 +++++++++-- ...-1.30.1-cst.config => busybox-1.32.0-cst.config} | 13 ++++++++++--- make/applications.mk | 4 ++-- make/versions.mk | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) rename archive-patches/{busybox-1.30.1-arm.config => busybox-1.32.0-arm.config} (99%) rename archive-patches/{busybox-1.30.1-cst.config => busybox-1.32.0-cst.config} (99%) diff --git a/archive-patches/busybox-1.30.1-arm.config b/archive-patches/busybox-1.32.0-arm.config similarity index 99% rename from archive-patches/busybox-1.30.1-arm.config rename to archive-patches/busybox-1.32.0-arm.config index 2beaa75..eaf467f 100644 --- a/archive-patches/busybox-1.30.1-arm.config +++ b/archive-patches/busybox-1.32.0-arm.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.1 -# Sun Feb 17 13:03:22 2019 +# Busybox version: 1.32.0 +# Mon Jun 29 10:21:10 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -458,6 +459,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y # CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -688,6 +690,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -805,6 +808,7 @@ CONFIG_MAKEDEVS=y CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +CONFIG_MIM=y # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -1095,6 +1099,7 @@ CONFIG_SH_IS_ASH=y CONFIG_BASH_IS_ASH=y # CONFIG_BASH_IS_HUSH is not set # CONFIG_BASH_IS_NONE is not set +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1115,6 +1120,7 @@ CONFIG_ASH_GETOPTS=y # CONFIG_ASH_CMDCMD is not set CONFIG_CTTYHACK=y # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1181,6 +1187,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set CONFIG_FEATURE_SYSLOGD_CFG=y +# 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=16 diff --git a/archive-patches/busybox-1.30.1-cst.config b/archive-patches/busybox-1.32.0-cst.config similarity index 99% rename from archive-patches/busybox-1.30.1-cst.config rename to archive-patches/busybox-1.32.0-cst.config index 85fb50d..51a2382 100644 --- a/archive-patches/busybox-1.30.1-cst.config +++ b/archive-patches/busybox-1.32.0-cst.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.1 -# Sun Feb 17 13:03:22 2019 +# Busybox version: 1.32.0 +# Mon Jun 29 10:21:10 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -76,6 +76,7 @@ CONFIG_PREFIX="./_install" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -156,7 +157,7 @@ CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y # CONFIG_XZCAT is not set # CONFIG_XZ is not set # CONFIG_BZIP2 is not set -CONFIG_BZIP2_SMALL=0 +# CONFIG_BZIP2_SMALL is not set # CONFIG_FEATURE_BZIP2_DECOMPRESS is not set # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set @@ -458,6 +459,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y # CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -688,6 +690,7 @@ CONFIG_FEATURE_SWAPONOFF_LABEL=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -805,6 +808,7 @@ CONFIG_MAKEDEVS=y CONFIG_FEATURE_MAKEDEVS_TABLE=y # CONFIG_MAN is not set # CONFIG_MICROCOM is not set +CONFIG_MIM=y # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -1095,6 +1099,7 @@ CONFIG_SH_IS_ASH=y CONFIG_BASH_IS_ASH=y # CONFIG_BASH_IS_HUSH is not set # CONFIG_BASH_IS_NONE is not set +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1115,6 +1120,7 @@ CONFIG_ASH_GETOPTS=y # CONFIG_ASH_CMDCMD is not set CONFIG_CTTYHACK=y # CONFIG_HUSH is not set +# CONFIG_SHELL_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_LINENO_VAR is not set @@ -1181,6 +1187,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set CONFIG_FEATURE_SYSLOGD_CFG=y +# 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=16 diff --git a/make/applications.mk b/make/applications.mk index e114dff..5d6177f 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -18,9 +18,9 @@ $(D)/procps: $(D)/libncurses $(ARCHIVE)/procps-3.2.8.tar.gz | $(TARGETPREFIX) $(TOUCH) ifeq ($(BOXTYPE), armbox) -BB_CONFIG = busybox-1.30.1-arm.config +BB_CONFIG = busybox-$(BUSYBOX_VER)-arm.config else -BB_CONFIG = busybox-1.30.1-cst.config +BB_CONFIG = busybox-$(BUSYBOX_VER)-cst.config endif busyboxconfig: $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) diff --git a/make/versions.mk b/make/versions.mk index e7c299c..daf76c2 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -10,7 +10,7 @@ AUTOFS5_MINOR = 1 AUTOFS5_MICRO = 6 AUTOFS5_VER = $(AUTOFS5_MAJOR).$(AUTOFS5_MINOR).$(AUTOFS5_MICRO) -BUSYBOX_VER = 1.31.1 +BUSYBOX_VER = 1.32.0 # cortex-strings; optimized string routines for ARM and AArch64 CORTEX_STRINGS_VER = 48fd30c -- 2.39.5