diff options
author | Ross Burton <ross.burton@intel.com> | 2018-01-22 17:16:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-23 23:43:45 +0000 |
commit | 664f0ca519b5899d36b7c248376c4301c06efc0c (patch) | |
tree | 9b7280ecd8ad386f1828cfc4a4041030a792cbeb | |
parent | 26983fc6e241e6e3a4dcdb5f0d63126c821fafe5 (diff) | |
download | poky-664f0ca519b5899d36b7c248376c4301c06efc0c.tar.gz |
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>
-rw-r--r-- | meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch index 3824eb3b70..75c6f3b8de 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch +++ b/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | |||
@@ -31,7 +31,7 @@ Index: git/opkg-build | |||
31 | + | 31 | + |
32 | +# Ignore error code 1, caused by modifying the number of hard links while creating the tar file | 32 | +# Ignore error code 1, caused by modifying the number of hard links while creating the tar file |
33 | +rc=0 | 33 | +rc=0 |
34 | +( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . ) || rc=$? | 34 | +( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) || rc=$? |
35 | +if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then | 35 | +if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then |
36 | + exit $rc | 36 | + exit $rc |
37 | +fi | 37 | +fi |