Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | If a the number of hard links decreases or increases while creating |
| 2 | the tar files used for an ipk package, tar fails with error code 1: |
| 3 | |
| 4 | | DEBUG: Executing python function do_package_ipk |
| 5 | | tar: ./usr/src/debug/gperf/3.0.4-r0/gperf-3.0.4/src/main.cc: file changed as we read it |
| 6 | NOTE: recipe gperf-3.0.4-r0: task do_package_write_ipk: Failed |
| 7 | ERROR: Task 6539 (recipes-extended/gperf/gperf_3.0.4.bb, do_package_write_ipk) failed with exit code '1' |
| 8 | |
| 9 | |
| 10 | We detect if the error code produced by tar is 1 and in this case ignore it. |
| 11 | |
| 12 | This a similar behavior to the one on dpkg: |
| 13 | http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818 |
| 14 | |
| 15 | Upstream-Status: Inappropriate |
| 16 | |
| 17 | Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> |
| 18 | |
| 19 | |
| 20 | Index: git/opkg-build |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 21 | |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | =================================================================== |
| 23 | --- git.orig/opkg-build |
| 24 | +++ git/opkg-build |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 25 | @@ -285,8 +285,21 @@ mkdir $tmp_dir |
| 26 | build_date="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%Y-%m-%d %H:%M:%S")" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 27 | |
| 28 | echo $CONTROL > $tmp_dir/tarX |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 29 | -( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) |
| 30 | -( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 31 | + |
| 32 | + |
| 33 | +# Ignore error code 1, caused by modifying the number of hard links while creating the tar file |
| 34 | +rc=0 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 35 | +( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) || rc=$? |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 36 | +if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then |
| 37 | + exit $rc |
| 38 | +fi |
| 39 | + |
| 40 | +rc=0 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 41 | +( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) || rc=$? |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 42 | +if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then |
| 43 | + exit $rc |
| 44 | +fi |
| 45 | + |
| 46 | rm $tmp_dir/tarX |
| 47 | |
| 48 | echo "2.0" > $tmp_dir/debian-binary |