diff --git a/rpm/busybox-sailfish.config b/rpm/busybox-sailfish.config index 9b4f912..f947459 100644 --- a/rpm/busybox-sailfish.config +++ b/rpm/busybox-sailfish.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.31.0 -# Thu Aug 15 12:48:59 2019 +# Mon Jan 27 15:29:36 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -196,152 +196,152 @@ CONFIG_FEATURE_TAR_SELINUX=y # # Coreutils # -# CONFIG_BASENAME is not set -# CONFIG_CAT is not set -# CONFIG_FEATURE_CATN is not set -# CONFIG_FEATURE_CATV is not set -# CONFIG_CHGRP is not set -# CONFIG_CHMOD is not set -# CONFIG_CHOWN is not set -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -# CONFIG_CHROOT is not set -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -# CONFIG_CP is not set -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -# CONFIG_FEATURE_CP_REFLINK is not set -# CONFIG_CUT is not set -# CONFIG_DATE is not set -# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_FEATURE_CATN=y +CONFIG_FEATURE_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +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 # CONFIG_FEATURE_DATE_NANO is not set -# CONFIG_FEATURE_DATE_COMPAT is not set -# CONFIG_DD is not set -# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -# CONFIG_FEATURE_DD_IBS_OBS is not set -# CONFIG_FEATURE_DD_STATUS is not set -# CONFIG_DF is not set -# CONFIG_FEATURE_DF_FANCY is not set -# CONFIG_DIRNAME is not set +CONFIG_FEATURE_DATE_COMPAT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_FEATURE_DD_STATUS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=y +CONFIG_DIRNAME=y # CONFIG_DOS2UNIX is not set # CONFIG_UNIX2DOS is not set -# CONFIG_DU is not set -# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set -# CONFIG_ECHO is not set -# CONFIG_FEATURE_FANCY_ECHO is not set -# CONFIG_ENV is not set -# CONFIG_EXPAND is not set -# CONFIG_UNEXPAND is not set -# CONFIG_EXPR is not set -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -# CONFIG_FACTOR is not set -# CONFIG_FALSE is not set -# CONFIG_FOLD is not set -# CONFIG_HEAD is not set -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -# CONFIG_ID is not set -# CONFIG_GROUPS is not set -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LINK is not set -# CONFIG_LN is not set -# CONFIG_LOGNAME is not set -# CONFIG_LS is not set -# CONFIG_FEATURE_LS_FILETYPES is not set -# CONFIG_FEATURE_LS_FOLLOWLINKS is not set -# CONFIG_FEATURE_LS_RECURSIVE is not set -# CONFIG_FEATURE_LS_WIDTH is not set -# CONFIG_FEATURE_LS_SORTFILES is not set -# CONFIG_FEATURE_LS_TIMESTAMPS is not set -# CONFIG_FEATURE_LS_USERNAME is not set -# CONFIG_FEATURE_LS_COLOR is not set -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_EXPAND=y +CONFIG_UNEXPAND=y +CONFIG_EXPR=y +CONFIG_EXPR_MATH_SUPPORT_64=y +CONFIG_FACTOR=y +CONFIG_FALSE=y +CONFIG_FOLD=y +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +CONFIG_HOSTID=y +CONFIG_ID=y +CONFIG_GROUPS=y +CONFIG_INSTALL=y +CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y +CONFIG_LINK=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_WIDTH=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y +CONFIG_MD5SUM=y +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y # CONFIG_SHA3SUM is not set -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set -# CONFIG_MKDIR is not set -# CONFIG_MKFIFO is not set -# CONFIG_MKNOD is not set -# CONFIG_MKTEMP is not set -# CONFIG_MV is not set -# CONFIG_NICE is not set -# CONFIG_NL is not set -# CONFIG_NOHUP is not set +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y +CONFIG_MKDIR=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MKTEMP=y +CONFIG_MV=y +CONFIG_NICE=y +CONFIG_NL=y +CONFIG_NOHUP=y # CONFIG_NPROC is not set -# CONFIG_OD is not set -# CONFIG_PASTE is not set -# CONFIG_PRINTENV is not set -# CONFIG_PRINTF is not set -# CONFIG_PWD is not set -# CONFIG_READLINK is not set -# CONFIG_FEATURE_READLINK_FOLLOW is not set +CONFIG_OD=y +CONFIG_PASTE=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y # CONFIG_REALPATH is not set -# CONFIG_RM is not set -# CONFIG_RMDIR is not set -# CONFIG_SEQ is not set -# CONFIG_SHRED is not set -# CONFIG_SHUF is not set -# CONFIG_SLEEP is not set -# CONFIG_FEATURE_FANCY_SLEEP is not set -# CONFIG_SORT is not set -# CONFIG_FEATURE_SORT_BIG is not set +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +CONFIG_SHRED=y +CONFIG_SHUF=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +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 -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_FEATURE_STAT_FILESYSTEM is not set -# CONFIG_STTY is not set -# CONFIG_SUM is not set -# CONFIG_SYNC is not set -# CONFIG_FEATURE_SYNC_FANCY is not set +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +CONFIG_STAT=y +CONFIG_FEATURE_STAT_FORMAT=y +CONFIG_FEATURE_STAT_FILESYSTEM=y +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +CONFIG_FEATURE_SYNC_FANCY=y # CONFIG_FSYNC is not set -# CONFIG_TAC is not set -# CONFIG_TAIL is not set -# CONFIG_FEATURE_FANCY_TAIL is not set -# CONFIG_TEE is not set -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -# CONFIG_TEST is not set -# CONFIG_TEST1 is not set +CONFIG_TAC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +CONFIG_TEST1=y # CONFIG_TEST2 is not set -# CONFIG_FEATURE_TEST_64 is not set +CONFIG_FEATURE_TEST_64=y # CONFIG_TIMEOUT is not set -# CONFIG_TOUCH is not set -# CONFIG_FEATURE_TOUCH_NODEREF is not set -# CONFIG_FEATURE_TOUCH_SUSV3 is not set -# CONFIG_TR is not set -# CONFIG_FEATURE_TR_CLASSES is not set -# CONFIG_FEATURE_TR_EQUIV is not set -# CONFIG_TRUE is not set +CONFIG_TOUCH=y +CONFIG_FEATURE_TOUCH_NODEREF=y +CONFIG_FEATURE_TOUCH_SUSV3=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_TRUE=y # CONFIG_TRUNCATE is not set -# CONFIG_TTY is not set -# CONFIG_UNAME is not set -CONFIG_UNAME_OSNAME="" +CONFIG_TTY=y +CONFIG_UNAME=y +CONFIG_UNAME_OSNAME="GNU/Linux" # CONFIG_BB_ARCH is not set -# CONFIG_UNIQ is not set -# CONFIG_UNLINK is not set +CONFIG_UNIQ=y +CONFIG_UNLINK=y # CONFIG_USLEEP is not set # CONFIG_UUDECODE is not set -# CONFIG_BASE64 is not set +CONFIG_BASE64=y # CONFIG_UUENCODE is not set -# CONFIG_WC is not set -# CONFIG_FEATURE_WC_LARGE is not set -# CONFIG_WHOAMI is not set -# CONFIG_WHO is not set +CONFIG_WC=y +CONFIG_FEATURE_WC_LARGE=y +CONFIG_WHOAMI=y +CONFIG_WHO=y # CONFIG_W is not set -# CONFIG_USERS is not set -# CONFIG_YES is not set +CONFIG_USERS=y +CONFIG_YES=y # # Common options # CONFIG_FEATURE_VERBOSE=y -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set -# CONFIG_FEATURE_HUMAN_READABLE is not set +CONFIG_FEATURE_PRESERVE_HARDLINKS=y +CONFIG_FEATURE_HUMAN_READABLE=y # # Console Utilities diff --git a/rpm/busybox.spec b/rpm/busybox.spec index 53bb165..89fe4b4 100644 --- a/rpm/busybox.spec +++ b/rpm/busybox.spec @@ -47,39 +47,36 @@ useful for recovering from certain types of system failures, particularly those involving broken shared libraries. This package provides a statically linked version of Busybox. +%package symlinks-coreutils +Requires: %{name} = %{version}-%{release} +Summary: Busybox replacements for coreutils +Provides: coreutils +Conflicts: gnu-coreutils + +%description symlinks-coreutils +%{summary} as symlinks. + %package symlinks-dosfstools Requires: %{name} = %{version}-%{release} Summary: Busybox replacements for dosfstools %description symlinks-dosfstools -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlinks implementing part of dosfstools. +%{summary} as symlinks. %package symlinks-gzip Requires: %{name} = %{version}-%{release} -Summary: Busybox replacements for gzip +Summary: Busybox replacement for gzip Provides: gzip %description symlinks-gzip -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlinks implementing gzip replacements. +%{summary} as symlinks. %package symlinks-dhcp Requires: %{name} = %{version}-%{release} Summary: Busybox dhcp utilities %description symlinks-dhcp -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This contains -the symlinks implementing the dhcp utilities (udhcpc/udhcpcd). +%{summary} as symlinks (udhcpc/udhcpcd). %package symlinks-diffutils Requires: %{name} = %{version}-%{release} @@ -88,11 +85,7 @@ Provides: diffutils Conflicts: gnu-diffutils %description symlinks-diffutils -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlinks implementing part of diffutils replacements. +%{summary} as symlinks. %package symlinks-findutils Requires: %{name} = %{version}-%{release} @@ -101,77 +94,53 @@ Provides: findutils Conflicts: gnu-findutils %description symlinks-findutils -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlinks implementing findutils replacements. +%{summary} as symlinks. %package symlinks-grep Requires: %{name} = %{version}-%{release} -Summary: Busybox replacements for grep +Summary: Busybox replacement for grep Provides: grep Provides: /bin/grep Conflicts: gnu-grep %description symlinks-grep -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlinks implementing grep, egrep and fgrep replacements. +%{summary} as symlinks (grep, egrep, fgrep). %package symlinks-cpio Requires: %{name} = %{version}-%{release} -Summary: Busybox replacements for cpio +Summary: Busybox replacement for cpio Provides: cpio Conflicts: gnu-cpio %description symlinks-cpio -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This contains -the symlinks implementing cpio replacements. +%{summary} as symlinks. %package symlinks-tar Requires: %{name} = %{version}-%{release} -Summary: Busybox replacements for tar +Summary: Busybox replacement for tar Provides: tar Conflicts: gnu-tar %description symlinks-tar -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlink implementing tar replacement. +%{summary} as symlinks. %package symlinks-vi Requires: %{name} = %{version}-%{release} -Summary: Busybox replacements for vi +Summary: Busybox replacement for vi Provides: vi Conflicts: vim-minimal %description symlinks-vi -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlink implementing vi replacement. +%{summary} as symlinks. %package symlinks-which Requires: %{name} = %{version}-%{release} -Summary: Busybox replacements for which +Summary: Busybox replacement for which Provides: which Conflicts: util-linux <= 2.33+git1 %description symlinks-which -Busybox is a single binary which includes versions of a large number -of system commands, including a shell. This package can be very -useful for recovering from certain types of system failures, -particularly those involving broken shared libraries. This -is the symlink implementing which replacement. +%{summary} as symlinks. %prep %setup -q -n %{name}-%{version}/upstream @@ -214,6 +183,37 @@ cat >> busybox.links << EOF %{_bindir}/cpio %{_bindir}/tar %{_bindir}/vi +/bin/env +%{_bindir}/base64 +%{_bindir}/cat +%{_bindir}/chgrp +%{_bindir}/chmod +%{_bindir}/chown +%{_bindir}/cp +%{_bindir}/date +%{_bindir}/dd +%{_bindir}/df +%{_bindir}/echo +%{_bindir}/false +%{_bindir}/link +%{_bindir}/ln +%{_bindir}/ls +%{_bindir}/mkdir +%{_bindir}/mknod +%{_bindir}/mktemp +%{_bindir}/mv +%{_bindir}/nice +%{_bindir}/printenv +%{_bindir}/pwd +%{_bindir}/rm +%{_bindir}/rmdir +%{_bindir}/sleep +%{_bindir}/stat +%{_bindir}/stty +%{_bindir}/sync +%{_bindir}/touch +%{_bindir}/true +%{_bindir}/uname EOF %install @@ -224,6 +224,8 @@ install -m 755 busybox %{buildroot}/usr/bin/busybox install -m 644 -D %{SOURCE1} %{buildroot}/lib/systemd/system/udhcpd.service applets/install.sh %{buildroot} --symlinks rm -f %{buildroot}/sbin/udhcpc +# Cleanup some symlinks +rm -f %{buildroot}/bin/base64 install -m 755 busybox-static %{buildroot}/usr/bin/busybox-static ln -s ../usr/bin/busybox-static %{buildroot}/bin/busybox-static @@ -254,6 +256,120 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \ %defattr(-,root,root,-) %doc %{_docdir}/%{name}-%{version} +%files symlinks-coreutils +%defattr(-,root,root,-) +/bin/cat +/bin/chgrp +/bin/chmod +/bin/chown +/bin/cp +/bin/date +/bin/dd +/bin/df +/bin/echo +/bin/env +/bin/false +/bin/link +/bin/ln +/bin/ls +/bin/mkdir +/bin/mknod +/bin/mktemp +/bin/mv +/bin/nice +/bin/printenv +/bin/pwd +/bin/rm +/bin/rmdir +/bin/sleep +/bin/stat +/bin/stty +/bin/sync +/bin/touch +/bin/true +/bin/uname +%{_bindir}/[ +%{_bindir}/base64 +%{_bindir}/basename +%{_bindir}/cat +%{_bindir}/chgrp +%{_bindir}/chmod +%{_bindir}/chown +%{_bindir}/cksum +%{_bindir}/comm +%{_bindir}/cp +%{_bindir}/cut +%{_bindir}/date +%{_bindir}/dd +%{_bindir}/df +%{_bindir}/dirname +%{_bindir}/du +%{_bindir}/echo +%{_bindir}/env +%{_bindir}/expand +%{_bindir}/expr +%{_bindir}/factor +%{_bindir}/false +%{_bindir}/fold +%{_bindir}/groups +%{_bindir}/head +%{_bindir}/hostid +%{_bindir}/id +%{_bindir}/install +%{_bindir}/link +%{_bindir}/ln +%{_bindir}/logname +%{_bindir}/ls +%{_bindir}/md5sum +%{_bindir}/mkdir +%{_bindir}/mkfifo +%{_bindir}/mknod +%{_bindir}/mktemp +%{_bindir}/mv +%{_bindir}/nice +%{_bindir}/nl +%{_bindir}/nohup +%{_bindir}/od +%{_bindir}/paste +%{_bindir}/printenv +%{_bindir}/printf +%{_bindir}/pwd +%{_bindir}/readlink +%{_bindir}/rm +%{_bindir}/rmdir +%{_bindir}/seq +%{_bindir}/sha1sum +%{_bindir}/sha256sum +%{_bindir}/sha512sum +%{_bindir}/shred +%{_bindir}/shuf +%{_bindir}/sleep +%{_bindir}/sort +%{_bindir}/split +%{_bindir}/stat +%{_bindir}/stty +%{_bindir}/sum +%{_bindir}/sync +%{_bindir}/tac +%{_bindir}/tail +%{_bindir}/tee +%{_bindir}/test +%{_bindir}/touch +%{_bindir}/tr +%{_bindir}/true +%{_bindir}/tty +%{_bindir}/uname +%{_bindir}/unexpand +%{_bindir}/uniq +%{_bindir}/unlink +%{_bindir}/users +%{_bindir}/wc +%{_bindir}/who +%{_bindir}/whoami +%{_bindir}/yes +%{_sbindir}/chroot + + %files symlinks-dosfstools %defattr(-,root,root,-) /sbin/mkdosfs @@ -289,12 +405,8 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \ %files symlinks-grep %defattr(-,root,root,-) -/bin/grep -%{_bindir}/grep -/bin/egrep -%{_bindir}/egrep -/bin/fgrep -%{_bindir}/fgrep +/bin/{,e,f}grep +%{_bindir}/{,e,f}grep %files symlinks-cpio %defattr(-,root,root,-)