From 36a1d1b3b4ff216a2c483c610b7cd9779303c01e Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 28 Jul 2018 14:33:48 +0200 Subject: [PATCH] bumb version busybox-1.29.1 --- ...x-1.29.1-changing-the-order-sys-tree.diff} | 0 ...3-cst.config => busybox-1.29.1-cst.config} | 21 ++++++++++++++++++- ...diff => busybox-1.29.1-fix-df-uclibc.diff} | 0 ...busybox-1.29.1-flashcp-small-output.patch} | 0 ... busybox-1.29.1-hack-init-s-console.patch} | 0 ...8.3-mdev.diff => busybox-1.29.1-mdev.diff} | 0 ...ode.patch => busybox-1.29.1-unicode.patch} | 0 make/applications.mk | 17 ++++++++------- make/versions.mk | 2 +- 9 files changed, 30 insertions(+), 10 deletions(-) rename archive-patches/{busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff => busybox-1.29.1-changing-the-order-sys-tree.diff} (100%) rename archive-patches/{busybox-1.28.3-cst.config => busybox-1.29.1-cst.config} (97%) rename archive-patches/{busybox-1.28.3-fix-df-uclibc.diff => busybox-1.29.1-fix-df-uclibc.diff} (100%) rename archive-patches/{busybox-1.28.3-flashcp-small-output.patch => busybox-1.29.1-flashcp-small-output.patch} (100%) rename archive-patches/{busybox-1.28.3-hack-init-s-console.patch => busybox-1.29.1-hack-init-s-console.patch} (100%) rename archive-patches/{busybox-1.28.3-mdev.diff => busybox-1.29.1-mdev.diff} (100%) rename archive-patches/{busybox-1.28.3-unicode.patch => busybox-1.29.1-unicode.patch} (100%) diff --git a/archive-patches/busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff b/archive-patches/busybox-1.29.1-changing-the-order-sys-tree.diff similarity index 100% rename from archive-patches/busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff rename to archive-patches/busybox-1.29.1-changing-the-order-sys-tree.diff diff --git a/archive-patches/busybox-1.28.3-cst.config b/archive-patches/busybox-1.29.1-cst.config similarity index 97% rename from archive-patches/busybox-1.28.3-cst.config rename to archive-patches/busybox-1.29.1-cst.config index d2df1d3..c1ea05c 100644 --- a/archive-patches/busybox-1.28.3-cst.config +++ b/archive-patches/busybox-1.29.1-cst.config @@ -52,6 +52,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set +# CONFIG_STACK_OPTIMIZATION_386 is not set # # Installation Options ("make install" behavior) @@ -90,6 +91,7 @@ CONFIG_MD5_SMALL=1 CONFIG_SHA3_SMALL=1 # CONFIG_FEATURE_FAST_TOP is not set # CONFIG_FEATURE_ETC_NETWORKS is not set +# CONFIG_FEATURE_ETC_SERVICES is not set CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set @@ -100,6 +102,7 @@ CONFIG_FEATURE_EDITING_SAVEHISTORY=y CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +# CONFIG_FEATURE_EDITING_WINCH is not set CONFIG_FEATURE_EDITING_ASK_TERMINAL=y # CONFIG_LOCALE_SUPPORT is not set CONFIG_UNICODE_SUPPORT=y @@ -149,6 +152,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 is not set # CONFIG_FEATURE_BZIP2_DECOMPRESS is not set # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set @@ -286,6 +290,7 @@ CONFIG_FEATURE_FANCY_SLEEP=y # CONFIG_FEATURE_FLOAT_SLEEP is not set CONFIG_SORT=y CONFIG_FEATURE_SORT_BIG=y +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set # CONFIG_SPLIT is not set # CONFIG_FEATURE_SPLIT_FANCY is not set # CONFIG_STAT is not set @@ -473,6 +478,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y +CONFIG_FEATURE_WAIT_FOR_INIT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" CONFIG_INIT=y @@ -700,6 +706,7 @@ CONFIG_FEATURE_VOLUMEID_F2FS=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set +# CONFIG_FEATURE_VOLUMEID_LFS is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_LUKS is not set @@ -776,6 +783,8 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set # CONFIG_FEATURE_LESS_DASHCMD is not set # CONFIG_FEATURE_LESS_LINENUMS is not set +# CONFIG_FEATURE_LESS_RAW is not set +# CONFIG_FEATURE_LESS_ENV is not set CONFIG_LSSCSI=y CONFIG_MAKEDEVS=y # CONFIG_FEATURE_MAKEDEVS_LEAF is not set @@ -895,6 +904,8 @@ CONFIG_NETSTAT=y # CONFIG_FEATURE_NETSTAT_WIDE is not set # CONFIG_FEATURE_NETSTAT_PRG is not set CONFIG_NSLOOKUP=y +# CONFIG_FEATURE_NSLOOKUP_BIG is not set +# CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set @@ -905,6 +916,8 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set +# CONFIG_TC is not set +# CONFIG_FEATURE_TC_INGRESS is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y @@ -952,7 +965,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/etc/network/udhcpc.sh" # CONFIG_FEATURE_UDHCPC6_RFC3646 is not set # CONFIG_FEATURE_UDHCPC6_RFC4704 is not set # CONFIG_FEATURE_UDHCPC6_RFC4833 is not set - +# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set # # Common options for DHCP applets # @@ -1038,6 +1051,7 @@ CONFIG_WATCH=y # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_SVC is not set +# CONFIG_SVOK is not set # CONFIG_SVLOGD is not set # CONFIG_CHCON is not set # CONFIG_GETENFORCE is not set @@ -1066,6 +1080,8 @@ CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set +# CONFIG_ASH_BASH_NOT_FOUND_HOOK is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y # CONFIG_ASH_RANDOM_SUPPORT is not set @@ -1082,6 +1098,8 @@ CONFIG_CTTYHACK=y # CONFIG_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 +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set @@ -1102,6 +1120,7 @@ CONFIG_CTTYHACK=y # CONFIG_HUSH_READONLY is not set # CONFIG_HUSH_KILL is not set # CONFIG_HUSH_WAIT is not set +# CONFIG_HUSH_COMMAND is not set # CONFIG_HUSH_TRAP is not set # CONFIG_HUSH_TYPE is not set # CONFIG_HUSH_TIMES is not set diff --git a/archive-patches/busybox-1.28.3-fix-df-uclibc.diff b/archive-patches/busybox-1.29.1-fix-df-uclibc.diff similarity index 100% rename from archive-patches/busybox-1.28.3-fix-df-uclibc.diff rename to archive-patches/busybox-1.29.1-fix-df-uclibc.diff diff --git a/archive-patches/busybox-1.28.3-flashcp-small-output.patch b/archive-patches/busybox-1.29.1-flashcp-small-output.patch similarity index 100% rename from archive-patches/busybox-1.28.3-flashcp-small-output.patch rename to archive-patches/busybox-1.29.1-flashcp-small-output.patch diff --git a/archive-patches/busybox-1.28.3-hack-init-s-console.patch b/archive-patches/busybox-1.29.1-hack-init-s-console.patch similarity index 100% rename from archive-patches/busybox-1.28.3-hack-init-s-console.patch rename to archive-patches/busybox-1.29.1-hack-init-s-console.patch diff --git a/archive-patches/busybox-1.28.3-mdev.diff b/archive-patches/busybox-1.29.1-mdev.diff similarity index 100% rename from archive-patches/busybox-1.28.3-mdev.diff rename to archive-patches/busybox-1.29.1-mdev.diff diff --git a/archive-patches/busybox-1.28.3-unicode.patch b/archive-patches/busybox-1.29.1-unicode.patch similarity index 100% rename from archive-patches/busybox-1.28.3-unicode.patch rename to archive-patches/busybox-1.29.1-unicode.patch diff --git a/make/applications.mk b/make/applications.mk index d6f050f..e36fd54 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -21,7 +21,7 @@ busyboxconfig: $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) $(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2 pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \ - cp $(PATCHES)/busybox-1.28.3-cst.config .config && \ + cp $(PATCHES)/busybox-1.29.1-cst.config .config && \ make ARCH=arm CROSS_COMPILE=$(TARGET)- menuconfig # Link against libtirpc so that we can leverage its RPC @@ -48,19 +48,20 @@ BUSYBOX_MAKE_OPTS = \ CONFIG_PREFIX="$(TARGETPREFIX)" ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos)) -DF_FIX = $(PATCH)/busybox-1.28.3-fix-df-uclibc.diff; +DF_FIX = $(PATCH)/busybox-1.29.1-fix-df-uclibc.diff; endif $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGETPREFIX) $(START_BUILD) + $(REMOVE)/busybox-$(BUSYBOX_VER) $(UNTAR)/busybox-$(BUSYBOX_VER).tar.bz2 pushd $(BUILD_TMP)/busybox-$(BUSYBOX_VER) && \ - $(PATCH)/busybox-1.28.3-hack-init-s-console.patch; \ - $(PATCH)/busybox-1.28.3-changing-the-order-sys-tree-is-scanned-with-mdev.diff; \ - $(PATCH)/busybox-1.28.3-mdev.diff; \ - $(PATCH)/busybox-1.28.3-unicode.patch; \ - $(PATCH)/busybox-1.28.3-flashcp-small-output.patch; \ + $(PATCH)/busybox-1.29.1-hack-init-s-console.patch; \ + $(PATCH)/busybox-1.29.1-changing-the-order-sys-tree.diff; \ + $(PATCH)/busybox-1.29.1-mdev.diff; \ + $(PATCH)/busybox-1.29.1-unicode.patch; \ + $(PATCH)/busybox-1.29.1-flashcp-small-output.patch; \ $(DF_FIX) \ - cp $(PATCHES)/busybox-1.28.3-cst.config .config && \ + cp $(PATCHES)/busybox-1.29.1-cst.config .config && \ $(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ $(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS) $(REMOVE)/busybox-$(BUSYBOX_VER) diff --git a/make/versions.mk b/make/versions.mk index e4d5a49..247e1bb 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -10,7 +10,7 @@ AUTOFS5_MINOR = 1 AUTOFS5_MICRO = 4 AUTOFS5_VER = $(AUTOFS5_MAJOR).$(AUTOFS5_MINOR).$(AUTOFS5_MICRO) -BUSYBOX_VER = 1.28.3 +BUSYBOX_VER = 1.29.1 # cortex-strings; optimized string routines for ARM and AArch64 CORTEX_STRINGS_VER = 48fd30c -- 2.39.5