Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into 'master'
Move to busybox cpio, because cpio moved to GPLv3+. Fixes JB#46088

See merge request mer-core/busybox!12
  • Loading branch information
Tomin1 committed Jun 28, 2019
2 parents 2ddf2a9 + b273e93 commit c1cd89d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rpm/busybox-sailfish.config
Expand Up @@ -154,7 +154,7 @@ CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
# CONFIG_BZIP2 is not set
CONFIG_BZIP2_SMALL=0
# CONFIG_FEATURE_BZIP2_DECOMPRESS is not set
# CONFIG_CPIO is not set
CONFIG_CPIO=y
# CONFIG_FEATURE_CPIO_O is not set
# CONFIG_FEATURE_CPIO_P is not set
# CONFIG_DPKG is not set
Expand Down
21 changes: 21 additions & 0 deletions rpm/busybox.spec
Expand Up @@ -129,6 +129,20 @@ 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.

%package symlinks-cpio
Requires: %{name} = %{version}-%{release}
Group: System/Shells
Summary: Busybox replacements 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.

%prep
%setup -q -n %{name}-%{version}/upstream
%patch0 -p1
Expand All @@ -147,6 +161,7 @@ make distclean

# Build dynamic version
cp %{SOURCE3} .config

yes "" | make oldconfig
make %{_smp_mflags}
make busybox.links
Expand All @@ -155,6 +170,7 @@ cat >> busybox.links << EOF
/usr/bin/gunzip
/usr/sbin/udhcpc
/bin/find
/usr/bin/cpio
EOF

%install
Expand Down Expand Up @@ -224,3 +240,8 @@ install -m 644 -t %{buildroot}/%{_docdir}/%{name}-%{version} \
/bin/grep
/bin/egrep
/bin/fgrep

%files symlinks-cpio
%defattr(-,root,root,-)
/usr/bin/cpio
/bin/cpio

0 comments on commit c1cd89d

Please sign in to comment.