From aa5e93d320111c5afa0dafb56e8b9073ad5facef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 27 Jan 2017 17:59:16 +0100 Subject: [PATCH] - up to 1.26.2; enable more features for initrd --- busybox-initrd.config | 88 ++++++++++++++++++++++++++++++------------- busybox.config | 41 +++++++++++++++++--- busybox.spec | 8 +--- 3 files changed, 98 insertions(+), 39 deletions(-) diff --git a/busybox-initrd.config b/busybox-initrd.config index f929686..c6f670a 100644 --- a/busybox-initrd.config +++ b/busybox-initrd.config @@ -136,6 +136,13 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set # CONFIG_GUNZIP is not set +# CONFIG_ZCAT is not set +# CONFIG_BZCAT is not set +# CONFIG_LZCAT is not set +# CONFIG_LZMA is not set +# CONFIG_XZCAT is not set +# CONFIG_UNLZOP is not set +# CONFIG_LZOPCAT is not set # CONFIG_GZIP is not set # CONFIG_LZOP is not set # CONFIG_RPM2CPIO is not set @@ -254,6 +261,8 @@ CONFIG_TAIL=y # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set CONFIG_TEST=y +CONFIG_TEST1=y +CONFIG_TEST2=y # CONFIG_FEATURE_TEST_64 is not set # CONFIG_TOUCH is not set # CONFIG_TR is not set @@ -397,6 +406,8 @@ CONFIG_FEATURE_VI_WIN_RESIZE=y # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set # CONFIG_FEATURE_GREP_FGREP_ALIAS is not set # CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_EGREP is not set +# CONFIG_FGREP is not set # CONFIG_XARGS is not set # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set @@ -417,6 +428,8 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INITRD is not set CONFIG_HALT=y +CONFIG_POWEROFF=y +CONFIG_REBOOT=y # CONFIG_FEATURE_CALL_TELINIT is not set # CONFIG_MESG is not set # CONFIG_ADD_SHELL is not set @@ -470,18 +483,15 @@ CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE=y # Linux Module Utilities # CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set CONFIG_RMMOD=y CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODPROBE is not set -# CONFIG_MODPROBE_SMALL is not set +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE_SMALL=y # CONFIG_DEPMOD is not set -# CONFIG_MODINFO is not set +CONFIG_MODINFO=y +CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y +CONFIG_MODPROBE=y # # Options common to multiple modutils @@ -491,6 +501,8 @@ CONFIG_FEATURE_CHECK_TAINTED_MODULE=y CONFIG_DEFAULT_MODULES_DIR="/lib/modules" CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" CONFIG_FEATURE_INSMOD_TRY_MMAP=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y # # Linux System Utilities @@ -523,6 +535,7 @@ CONFIG_FREERAMDISK=y # CONFIG_MKFS_VFAT is not set # CONFIG_MKFS_EXT2 is not set # CONFIG_MKFS_REISER is not set +# CONFIG_MKDOSFS is not set # CONFIG_FEATURE_MINIX2 is not set # CONFIG_GETOPT is not set # CONFIG_HEXDUMP is not set @@ -542,6 +555,7 @@ CONFIG_FEATURE_MDEV_RENAME=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +# CONFIG_MKE2FS is not set # CONFIG_MKSWAP is not set # CONFIG_MORE is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -578,7 +592,12 @@ CONFIG_PIVOT_ROOT=y # CONFIG_READPROFILE is not set # CONFIG_RTCWAKE is not set # CONFIG_SETARCH is not set -# CONFIG_SWAPONOFF is not set +# CONFIG_LINUX32 is not set +# CONFIG_LINUX64 is not set +CONFIG_SWAPON=y +CONFIG_FEATURE_SWAPON_DISCARD=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWAPOFF=y CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -705,6 +724,7 @@ CONFIG_VERBOSE_RESOLUTION_ERRORS=y # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y +CONFIG_DNSDOMAINNAME=y # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_SETUID is not set @@ -724,6 +744,8 @@ CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y # CONFIG_IFENSLAVE is not set # CONFIG_IFPLUGD is not set +# CONFIG_IFUP is not set +# CONFIG_IFDOWN is not set # CONFIG_IFUPDOWN is not set CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_IFUPDOWN_IP is not set @@ -740,19 +762,21 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set # CONFIG_FEATURE_INETD_RPC is not set -# CONFIG_IP is not set -# CONFIG_FEATURE_IP_ADDRESS is not set -# CONFIG_FEATURE_IP_LINK is not set -# CONFIG_FEATURE_IP_ROUTE is not set -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=u +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +CONFIG_FEATURE_IP_RARE_PROTOCOLS=y +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPNEIGH=y +CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" # CONFIG_IPCALC is not set # CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set @@ -788,6 +812,9 @@ CONFIG_ROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_TRACEROUTE6 is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set # CONFIG_UDHCPD is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" @@ -852,11 +879,14 @@ CONFIG_FEATURE_SHOW_THREADS=y # # Shells # -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_BASH_IS_ASH=y +# CONFIG_BASH_IS_HUSH is not set +# CONFIG_BASH_IS_NONE is not set CONFIG_FEATURE_BASH_IS_ASH=y -# CONFIG_FEATURE_BASH_IS_NONE is not set +# CONFIG_BASH_IS_NONE is not set +CONFIG_SH_IS_ASH=y +# CONFIG_SH_IS_HUSH is not set +# CONFIG_SH_IS_NONE is not set CONFIG_ASH=y # @@ -874,6 +904,7 @@ CONFIG_ASH_ALIAS=y # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_INTERNAL_GLOB=y # CONFIG_ASH_RANDOM_SUPPORT is not set # CONFIG_ASH_EXPAND_PRMT is not set # CONFIG_HUSH is not set @@ -884,6 +915,8 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y # CONFIG_HUSH_IF is not set # CONFIG_HUSH_LOOPS is not set # CONFIG_MSH is not set +CONFIG_FEATURE_SH_MATH=y +CONFIG_FEATURE_SH_MATH_64=y # # Bourne Shell Options @@ -916,6 +949,7 @@ CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE= # CONFIG_RUNSV is not set # CONFIG_RUNSVDIR is not set # CONFIG_SV is not set +# CONFIG_SVC is not set # CONFIG_SVLOGD is not set # CONFIG_CHPST is not set # CONFIG_SETUIDGID is not set diff --git a/busybox.config b/busybox.config index ffc570a..51150d8 100644 --- a/busybox.config +++ b/busybox.config @@ -138,6 +138,7 @@ CONFIG_AR=y CONFIG_FEATURE_AR_LONG_FILENAMES=y CONFIG_FEATURE_AR_CREATE=y CONFIG_BUNZIP2=y +CONFIG_BZCAT=y CONFIG_BZIP2=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y @@ -146,6 +147,7 @@ CONFIG_DPKG=y CONFIG_DPKG_DEB=y CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY=y CONFIG_GUNZIP=y +CONFIG_ZCAT=y CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y CONFIG_GZIP=y CONFIG_FEATURE_GZIP_LONG_OPTIONS=y @@ -153,6 +155,8 @@ CONFIG_GZIP_FAST=0 CONFIG_FEATURE_GZIP_LEVELS=y CONFIG_LZOP=y CONFIG_LZOP_COMPR_HIGH=y +CONFIG_UNLZOP=y +CONFIG_LZOPCAT=y CONFIG_RPM2CPIO=y CONFIG_RPM=y CONFIG_TAR=y @@ -168,7 +172,9 @@ CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y CONFIG_FEATURE_TAR_TO_COMMAND=y CONFIG_UNCOMPRESS=y CONFIG_UNLZMA=y +CONFIG_LZCAT=y CONFIG_UNXZ=y +CONFIG_XZCAT=y CONFIG_XZ=y # CONFIG_FEATURE_LZMA_FAST is not set CONFIG_LZMA=y @@ -282,6 +288,8 @@ CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y +CONFIG_TEST1=y +CONFIG_TEST2=y CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y CONFIG_FEATURE_TOUCH_SUSV3=y @@ -439,6 +447,8 @@ CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_EGREP=y +CONFIG_FGREP=y CONFIG_XARGS=y # CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y @@ -462,6 +472,8 @@ CONFIG_FEATURE_INIT_SYSLOG=y CONFIG_FEATURE_INITRD=y CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_HALT=y +CONFIG_POWEROFF=y +CONFIG_REBOOT=y CONFIG_MESG=y CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y CONFIG_BOOTCHARTD=y @@ -583,6 +595,7 @@ CONFIG_MKFS_MINIX=y CONFIG_MKFS_VFAT=y CONFIG_MKFS_EXT2=y CONFIG_MKFS_REISER=y +CONFIG_MKDOSFS=y CONFIG_REV=y CONFIG_UEVENT=y CONFIG_UNSHARE=y @@ -612,6 +625,7 @@ CONFIG_FEATURE_MDEV_RENAME=y CONFIG_FEATURE_MDEV_RENAME_REGEXP=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MKE2FS=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y @@ -636,6 +650,7 @@ CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y +CONFIG_FEATURE_VOLUMEID_UBIFS=y CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y CONFIG_FEATURE_VOLUMEID_F2FS=y @@ -659,7 +674,11 @@ CONFIG_RTCWAKE=y CONFIG_SCRIPT=y CONFIG_SCRIPTREPLAY=y CONFIG_SETARCH=y +CONFIG_LINUX32=y +CONFIG_LINUX64=y +CONFIG_SWAPON=y CONFIG_SWAPONOFF=y +CONFIG_SWAPOFF=y CONFIG_FEATURE_SWAPON_DISCARD=y CONFIG_FEATURE_SWAPON_PRI=y CONFIG_SWITCH_ROOT=y @@ -786,11 +805,14 @@ CONFIG_FAKEIDENTD=y CONFIG_FTPD=y CONFIG_FEATURE_FTP_WRITE=y CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y +CONFIG_FEATURE_FTPD_WRITE=y +CONFIG_FEATURE_FTPD_AUTHENTICATION=y CONFIG_FEATURE_FTP_AUTHENTICATION=y CONFIG_FTPGET=y CONFIG_FTPPUT=y # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y +CONFIG_DNSDOMAINNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y CONFIG_FEATURE_HTTPD_SETUID=y @@ -811,6 +833,8 @@ CONFIG_FEATURE_IFCONFIG_HW=y # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set CONFIG_IFENSLAVE=y CONFIG_IFPLUGD=y +CONFIG_IFUP=y +CONFIG_IFDOWN=y CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" CONFIG_FEATURE_IFUPDOWN_IP=y @@ -842,6 +866,7 @@ CONFIG_IPLINK=y CONFIG_IPROUTE=y CONFIG_IPTUNNEL=y CONFIG_IPRULE=y +CONFIG_IPNEIGH=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set @@ -982,6 +1007,7 @@ CONFIG_WATCH=y # CONFIG_FEATURE_RUNSVDIR_LOG is not set # CONFIG_SV is not set CONFIG_SV_DEFAULT_SERVICE_DIR="" +CONFIG_SVC=y # CONFIG_SVLOGD is not set CONFIG_CHPST=y CONFIG_SETUIDGID=y @@ -1007,12 +1033,12 @@ CONFIG_SOFTLIMIT=y # # Shells # -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_FEATURE_BASH_IS_ASH=y -# CONFIG_FEATURE_BASH_IS_HUSH is not set -# CONFIG_FEATURE_BASH_IS_NONE is not set +CONFIG_BASH_IS_ASH=y +# CONFIG_BASH_IS_HUSH is not set +# CONFIG_BASH_IS_NONE is not set +CONFIG_SH_IS_ASH=y +# CONFIG_SH_IS_HUSH is not set +# CONFIG_SH_IS_NONE is not set CONFIG_ASH=y # @@ -1030,6 +1056,7 @@ CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y CONFIG_ASH_MAIL=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_RANDOM_SUPPORT=y CONFIG_ASH_EXPAND_PRMT=y CONFIG_HUSH=y @@ -1049,6 +1076,8 @@ CONFIG_HUSH_LOCAL=y CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_RANDOM_SUPPORT=y CONFIG_MSH=y +CONFIG_FEATURE_SH_MATH=y +CONFIG_FEATURE_SH_MATH_64=y # # Bourne Shell Options diff --git a/busybox.spec b/busybox.spec index cdf3f28..4e9dd18 100644 --- a/busybox.spec +++ b/busybox.spec @@ -41,17 +41,15 @@ Summary(pl.UTF-8): Zestaw narzędzi uniksowych dla systemów wbudowanych Summary(pt_BR.UTF-8): BusyBox é um conjunto de utilitários UNIX em um único binário Name: busybox # stable line only -Version: 1.25.1 +Version: 1.26.2 Release: 1 License: GPL v2 Group: Applications Source0: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2 -# Source0-md5: 4f4c5de50b479b11ff636d7d8eb902a2 +# Source0-md5: bb59d25ee2643db20f212eec539429f1 Source1: %{name}.config Source2: %{name}-initrd.config %{?with_altconfig:Source3: %{cfgfile}} -Patch100: https://busybox.net/downloads/fixes-1.25.1/busybox-1.25.1-setfiles.patch -# Patch100-md5: 62152de75f60d0e729f68565560e4e19 Patch0: x32.patch Patch1: %{name}-logconsole.patch Patch2: %{name}-printf-gettext.patch @@ -161,8 +159,6 @@ Statycznie skonsolidowany busybox dla initrd. %prep %setup -q -%patch100 -p1 - %patch0 -p1 %patch1 -p1 %patch2 -p1 -- 2.44.0