From 954f93b2d005dd3ddc719564998eb81dc6413890 Mon Sep 17 00:00:00 2001 From: Markham Date: Sun, 17 Feb 2019 13:49:52 +0100 Subject: [PATCH] bump version busybox-1.30.1 --- .../busybox-1.29.1-fix-df-uclibc.diff | 90 ------------------- ...1-cst.config => busybox-1.30.1-cst.config} | 27 ++++-- make/applications.mk | 9 +- make/versions.mk | 2 +- 4 files changed, 25 insertions(+), 103 deletions(-) delete mode 100644 archive-patches/busybox-1.29.1-fix-df-uclibc.diff rename archive-patches/{busybox-1.29.1-cst.config => busybox-1.30.1-cst.config} (98%) diff --git a/archive-patches/busybox-1.29.1-fix-df-uclibc.diff b/archive-patches/busybox-1.29.1-fix-df-uclibc.diff deleted file mode 100644 index 42241cd..0000000 --- a/archive-patches/busybox-1.29.1-fix-df-uclibc.diff +++ /dev/null @@ -1,90 +0,0 @@ ---- a/coreutils/df.c 2017-07-06 17:14:57.000000000 +0200 -+++ b/coreutils/df.c 2015-07-13 04:18:47.000000000 +0200 -@@ -7,6 +7,10 @@ - * - * Licensed under GPLv2 or later, see file LICENSE in this source tree. - */ -+ -+/* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */ -+/* http://www.opengroup.org/onlinepubs/007904975/utilities/df.html */ -+ - /* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) - * - * Size reduction. Removed floating point dependency. Added error checking -@@ -127,19 +109,8 @@ - if (opt & OPT_MEGA) - df_disp_hr = 1024*1024; - -- if (opt & OPT_BSIZE) { -- /* GNU coreutils 8.25 accepts "-BMiB" form too */ -- int i; -- for (i = 0; kmg_i_suffixes[i].suffix[0]; i++) { -- if (strcmp(kmg_i_suffixes[i].suffix, chp) == 0) { -- df_disp_hr = kmg_i_suffixes[i].mult; -- goto got_it; -- } -- } -- /* Range used to disallow 0 */ -- df_disp_hr = xatoul_range_sfx(chp, 1, ULONG_MAX, kmg_i_suffixes); -- got_it: ; -- } -+ if (opt & OPT_BSIZE) -+ df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */ - - /* From the manpage of df from coreutils-6.10: - * Disk space is shown in 1K blocks by default, unless the environment -@@ -212,17 +183,12 @@ - bb_simple_perror_msg(mount_point); - goto set_error; - } -- /* Some uclibc versions were seen to lose f_frsize -- * (kernel does return it, but then uclibc does not copy it) -- */ -- if (s.f_frsize == 0) -- s.f_frsize = s.f_bsize; - - if ((s.f_blocks > 0) || !mount_table || (opt & OPT_ALL)) { - if (opt & OPT_INODE) { - s.f_blocks = s.f_files; - s.f_bavail = s.f_bfree = s.f_ffree; -- s.f_frsize = 1; -+ s.f_bsize = 1; - - if (df_disp_hr) - df_disp_hr = 1; -@@ -280,26 +246,26 @@ - - #if ENABLE_FEATURE_HUMAN_READABLE - printf(" %9s ", -- /* f_blocks x f_frsize / df_disp_hr, show one fractional, -+ /* f_blocks x f_bsize / df_disp_hr, show one fractional, - * use suffixes if df_disp_hr == 0 */ -- make_human_readable_str(s.f_blocks, s.f_frsize, df_disp_hr)); -+ make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr)); - - printf(" %9s " + 1, -- /* EXPR x f_frsize / df_disp_hr, show one fractional, -+ /* EXPR x f_bsize / df_disp_hr, show one fractional, - * use suffixes if df_disp_hr == 0 */ - make_human_readable_str((s.f_blocks - s.f_bfree), -- s.f_frsize, df_disp_hr)); -+ s.f_bsize, df_disp_hr)); - - printf("%9s %3u%% %s\n", -- /* f_bavail x f_frsize / df_disp_hr, show one fractional, -+ /* f_bavail x f_bsize / df_disp_hr, show one fractional, - * use suffixes if df_disp_hr == 0 */ -- make_human_readable_str(s.f_bavail, s.f_frsize, df_disp_hr), -+ make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr), - blocks_percent_used, mount_point); - #else - printf(" %9lu %9lu %9lu %3u%% %s\n", -- kscale(s.f_blocks, s.f_frsize), -- kscale(s.f_blocks - s.f_bfree, s.f_frsize), -- kscale(s.f_bavail, s.f_frsize), -+ kscale(s.f_blocks, s.f_bsize), -+ kscale(s.f_blocks - s.f_bfree, s.f_bsize), -+ kscale(s.f_bavail, s.f_bsize), - blocks_percent_used, mount_point); - #endif - } diff --git a/archive-patches/busybox-1.29.1-cst.config b/archive-patches/busybox-1.30.1-cst.config similarity index 98% rename from archive-patches/busybox-1.29.1-cst.config rename to archive-patches/busybox-1.30.1-cst.config index c1ea05c..9c6ea7a 100644 --- a/archive-patches/busybox-1.29.1-cst.config +++ b/archive-patches/busybox-1.30.1-cst.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.28.1 -# Sun Feb 25 13:19:53 2018 +# Busybox version: 1.30.1 +# Sun Feb 17 13:03:22 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -24,6 +24,7 @@ CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_PIDFILE=y CONFIG_PID_FILE_PATH="/var/run" CONFIG_BUSYBOX=y +# CONFIG_FEATURE_SHOW_SCRIPT is not set CONFIG_FEATURE_INSTALLER=y CONFIG_INSTALL_NO_USR=y CONFIG_FEATURE_SUID=y @@ -82,7 +83,9 @@ CONFIG_NO_DEBUG_LIB=y # Library Tuning # # CONFIG_FEATURE_USE_BSS_TAIL is not set +CONFIG_FLOAT_DURATION=y CONFIG_FEATURE_RTMINMAX=y +CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set @@ -152,7 +155,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_BZIP2_SMALL=0 # CONFIG_FEATURE_BZIP2_DECOMPRESS is not set # CONFIG_CPIO is not set # CONFIG_FEATURE_CPIO_O is not set @@ -205,6 +208,7 @@ CONFIG_CHROOT=y # CONFIG_COMM is not set CONFIG_CP=y CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_FEATURE_CP_REFLINK=y CONFIG_CUT=y CONFIG_DATE=y CONFIG_FEATURE_DATE_ISOFMT=y @@ -287,7 +291,6 @@ CONFIG_SEQ=y # CONFIG_SHUF is not set CONFIG_SLEEP=y 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 @@ -438,6 +441,7 @@ CONFIG_FEATURE_FIND_MTIME=y CONFIG_FEATURE_FIND_MMIN=y CONFIG_FEATURE_FIND_PERM=y CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_EXECUTABLE=y CONFIG_FEATURE_FIND_XDEV=y CONFIG_FEATURE_FIND_MAXDEPTH=y CONFIG_FEATURE_FIND_NEWER=y @@ -451,6 +455,7 @@ CONFIG_FEATURE_FIND_DEPTH=y CONFIG_FEATURE_FIND_PAREN=y 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_PATH=y CONFIG_FEATURE_FIND_REGEX=y @@ -653,6 +658,8 @@ CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_OTHERTAB=y # CONFIG_MOUNTPOINT is not set +CONFIG_NOLOGIN=y +CONFIG_NOLOGIN_DEPENDENCIES=y # CONFIG_NSENTER is not set CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y @@ -728,6 +735,12 @@ CONFIG_FEATURE_VOLUMEID_NILFS=y # CONFIG_ADJTIMEX is not set CONFIG_BBCONFIG=y CONFIG_FEATURE_COMPRESS_BBCONFIG=y +# CONFIG_BC is not set +# CONFIG_DC is not set +# CONFIG_FEATURE_DC_BIG is not set +# CONFIG_FEATURE_DC_LIBM is not set +# CONFIG_FEATURE_BC_INTERACTIVE is not set +# CONFIG_FEATURE_BC_LONG_OPTIONS is not set # CONFIG_BEEP is not set CONFIG_FEATURE_BEEP_FREQ=0 CONFIG_FEATURE_BEEP_LENGTH_MS=0 @@ -746,8 +759,6 @@ CONFIG_CROND=y CONFIG_FEATURE_CROND_SPECIAL_TIMES=y CONFIG_FEATURE_CROND_DIR="/var/etc/cron" CONFIG_CRONTAB=y -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set @@ -822,6 +833,7 @@ CONFIG_WATCHDOG=y # CONFIG_FEATURE_UNIX_LOCAL is not set # CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_FEATURE_TLS_SHA1 is not set # CONFIG_ARP is not set # CONFIG_ARPING is not set # CONFIG_BRCTL is not set @@ -909,6 +921,7 @@ CONFIG_NSLOOKUP=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set # CONFIG_FEATURE_NTPD_CONF is not set +# CONFIG_FEATURE_NTP_AUTH is not set CONFIG_PING=y # CONFIG_PING6 is not set CONFIG_FEATURE_FANCY_PING=y @@ -966,6 +979,7 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/etc/network/udhcpc.sh" # 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 # @@ -1142,6 +1156,7 @@ CONFIG_FEATURE_SH_MATH=y # CONFIG_FEATURE_SH_NOFORK is not set CONFIG_FEATURE_SH_READ_FRAC=y CONFIG_FEATURE_SH_HISTFILESIZE=y +CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y # # System Logging Utilities diff --git a/make/applications.mk b/make/applications.mk index 8e25330..f242d52 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.29.1-cst.config .config && \ + cp $(PATCHES)/busybox-1.30.1-cst.config .config && \ make ARCH=arm CROSS_COMPILE=$(TARGET)- menuconfig # Link against libtirpc so that we can leverage its RPC @@ -47,9 +47,6 @@ BUSYBOX_MAKE_OPTS = \ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ CONFIG_PREFIX="$(TARGETPREFIX)" -ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos)) -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) @@ -60,10 +57,10 @@ $(D)/busybox: $(D)/libtirpc $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2 | $(TARGET $(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.29.1-cst.config .config && \ + cp $(PATCHES)/busybox-1.30.1-cst.config .config && \ $(BUSYBOX_MAKE_ENV) $(MAKE) busybox $(BUSYBOX_MAKE_OPTS) && \ $(BUSYBOX_MAKE_ENV) $(MAKE) install $(BUSYBOX_MAKE_OPTS) + $(TARGET)-strip $(TARGETPREFIX)/bin/busybox $(REMOVE)/busybox-$(BUSYBOX_VER) $(TOUCH) diff --git a/make/versions.mk b/make/versions.mk index 5a37143..633d1cc 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.29.3 +BUSYBOX_VER = 1.30.1 # cortex-strings; optimized string routines for ARM and AArch64 CORTEX_STRINGS_VER = 48fd30c -- 2.39.5