diff --git a/rpm/busybox-sailfish.config b/rpm/busybox-sailfish.config index 3746576..0298f8a 100644 --- a/rpm/busybox-sailfish.config +++ b/rpm/busybox-sailfish.config @@ -131,11 +131,11 @@ CONFIG_FEATURE_COPYBUF_KB=4 # # Archival Utilities # -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set +CONFIG_FEATURE_SEAMLESS_XZ=y +CONFIG_FEATURE_SEAMLESS_LZMA=y +CONFIG_FEATURE_SEAMLESS_BZ2=y +CONFIG_FEATURE_SEAMLESS_GZ=y +CONFIG_FEATURE_SEAMLESS_Z=y # CONFIG_AR is not set # CONFIG_FEATURE_AR_LONG_FILENAMES is not set # CONFIG_FEATURE_AR_CREATE is not set @@ -170,18 +170,18 @@ CONFIG_FEATURE_GZIP_DECOMPRESS=y # CONFIG_LZOP_COMPR_HIGH is not set # CONFIG_RPM is not set # CONFIG_RPM2CPIO is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y +CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_TO_COMMAND=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +CONFIG_FEATURE_TAR_SELINUX=y # CONFIG_UNZIP is not set # CONFIG_FEATURE_UNZIP_CDF is not set # CONFIG_FEATURE_UNZIP_BZIP2 is not set diff --git a/rpm/busybox.spec b/rpm/busybox.spec index c1cbe9c..c344537 100644 --- a/rpm/busybox.spec +++ b/rpm/busybox.spec @@ -143,6 +143,20 @@ useful for recovering from certain types of system failures, particularly those involving broken shared libraries. This contains the symlinks implementing cpio replacements. +%package symlinks-tar +Requires: %{name} = %{version}-%{release} +Group: System/Shells +Summary: Busybox replacements for tar +Provides: tar = %{version} +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. + %prep %setup -q -n %{name}-%{version}/upstream %patch0 -p1 @@ -152,7 +166,7 @@ the symlinks implementing cpio replacements. # currently the features differ quite a bit cp %{SOURCE2} .config yes "" | make oldconfig -make %{?jobs:-j%jobs} +make %{?_smp_mflags} cp busybox busybox-static # clean any leftovers from static build @@ -171,6 +185,7 @@ cat >> busybox.links << EOF /usr/sbin/udhcpc /bin/find /usr/bin/cpio +/usr/bin/tar EOF %install @@ -245,3 +260,8 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \ %defattr(-,root,root,-) /usr/bin/cpio /bin/cpio + +%files symlinks-tar +%defattr(-,root,root,-) +/usr/bin/tar +/bin/tar