opkg-utils: refresh patch to fix selectable compressors

We patch opkg-build to ignore hard link count changes when archiving, but in the
last upgrade (oe-core 60c9a97) the patch was refreshed to apply but the result
is that opkg-build loses the ability to switch compressor.

Refresh the patch again so that it just adds the error ignoring logic and
doesn't otherwise change the behaviour of opkg-build.

(From OE-Core rev: e8f99fa61fc00c66d216c5f3e5d37ffc42f2574b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-01-22 17:16:48 +00:00
committed by Richard Purdie
parent 26983fc6e2
commit 664f0ca519

View File

@@ -31,7 +31,7 @@ Index: git/opkg-build
+
+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
+rc=0
+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . ) || rc=$?
+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) || rc=$?
+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
+ exit $rc
+fi