From e8f99fa61fc00c66d216c5f3e5d37ffc42f2574b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 22 Jan 2018 17:16:48 +0000 Subject: 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. Signed-off-by: Ross Burton --- meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-devtools/opkg-utils') 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 + +# 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 -- cgit 1.2.3-korg