summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch')
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch13
1 files changed, 7 insertions, 6 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 75c6f3b8de..d8931b281f 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
@@ -18,26 +18,27 @@ Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
18 18
19 19
20Index: git/opkg-build 20Index: git/opkg-build
21
21=================================================================== 22===================================================================
22--- git.orig/opkg-build 23--- git.orig/opkg-build
23+++ git/opkg-build 24+++ git/opkg-build
24@@ -250,8 +250,21 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$ 25@@ -285,8 +285,21 @@ mkdir $tmp_dir
25 mkdir $tmp_dir 26 build_date="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%Y-%m-%d %H:%M:%S")"
26 27
27 echo $CONTROL > $tmp_dir/tarX 28 echo $CONTROL > $tmp_dir/tarX
28-( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) 29-( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext )
29-( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) 30-( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz )
30+ 31+
31+ 32+
32+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file 33+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
33+rc=0 34+rc=0
34+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) || rc=$? 35+( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) || rc=$?
35+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then 36+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
36+ exit $rc 37+ exit $rc
37+fi 38+fi
38+ 39+
39+rc=0 40+rc=0
40+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$? 41+( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) || rc=$?
41+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then 42+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
42+ exit $rc 43+ exit $rc
43+fi 44+fi