From b273e93e427eb052da19f9882f8b9a8f2fd4a0f0 Mon Sep 17 00:00:00 2001
From: Denis Semakin <d.semakin@omprussia.ru>
Date: Thu, 30 May 2019 17:57:51 +0300
Subject: [PATCH] Move to busybox cpio, because cpio moved to GPLv3+. Fixes
 JB#46088

Signed-off-by: Denis Semakin <d.semakin@omprussia.ru>
---
 rpm/busybox-sailfish.config |  2 +-
 rpm/busybox.spec            | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/rpm/busybox-sailfish.config b/rpm/busybox-sailfish.config
index b682431..3746576 100644
--- a/rpm/busybox-sailfish.config
+++ b/rpm/busybox-sailfish.config
@@ -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
diff --git a/rpm/busybox.spec b/rpm/busybox.spec
index 9271298..c1cbe9c 100644
--- a/rpm/busybox.spec
+++ b/rpm/busybox.spec
@@ -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
@@ -147,6 +161,7 @@ make distclean
 
 # Build dynamic version
 cp %{SOURCE3} .config
+
 yes "" | make oldconfig
 make %{_smp_mflags}
 make busybox.links
@@ -155,6 +170,7 @@ cat >> busybox.links << EOF
 /usr/bin/gunzip
 /usr/sbin/udhcpc
 /bin/find
+/usr/bin/cpio
 EOF
 
 %install
@@ -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