diff options
| author |   Alejandro del Castillo <alejandro.delcastillo@ni.com> | 2018-12-26 17:59:05 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-27 22:50:00 +0000 |
| commit | 19ac60adbfc9c3ea1896e7e0d83f3b33438c092b (patch) | |
| tree | 5c55cc987ea1ef17bb0e87ee7fc90e5caea8c877 /meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | |
| parent | 74d3b4a199bfeae99dfbe6f23f1c3cb4bf76abff (diff) | |
| download | openembedded-core-contrib-19ac60adbfc9c3ea1896e7e0d83f3b33438c092b.tar.gz | |
opkg-utils: upgrade to version 0.4.0
Drop patches already merged upstream.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 48 |
1 files changed, 0 insertions, 48 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 deleted file mode 100644 index d8931b281f..0000000000 --- a/meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch +++ /dev/null @@ -1,48 +0,0 @@ -If a the number of hard links decreases or increases while creating -the tar files used for an ipk package, tar fails with error code 1: - -| DEBUG: Executing python function do_package_ipk -| tar: ./usr/src/debug/gperf/3.0.4-r0/gperf-3.0.4/src/main.cc: file changed as we read it -NOTE: recipe gperf-3.0.4-r0: task do_package_write_ipk: Failed -ERROR: Task 6539 (recipes-extended/gperf/gperf_3.0.4.bb, do_package_write_ipk) failed with exit code '1' - - -We detect if the error code produced by tar is 1 and in this case ignore it. - -This a similar behavior to the one on dpkg: -http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=40731942515ec8d80c727ad561174986d4f05818 - -Upstream-Status: Inappropriate - -Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> - - -Index: git/opkg-build - -=================================================================== ---- git.orig/opkg-build -+++ git/opkg-build -@@ -285,8 +285,21 @@ mkdir $tmp_dir - build_date="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" "+%Y-%m-%d %H:%M:%S")" - - echo $CONTROL > $tmp_dir/tarX --( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) --( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) -+ -+ -+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file -+rc=0 -+( cd $pkg_dir && tar $ogargs $tsortargs --mtime="$build_date" -X $tmp_dir/tarX -c $tarformat . | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) || rc=$? -+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then -+ exit $rc -+fi -+ -+rc=0 -+( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --mtime="$build_date" -c $tarformat . | gzip $zipargs > $tmp_dir/control.tar.gz ) || rc=$? -+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then -+ exit $rc -+fi -+ - rm $tmp_dir/tarX - - echo "2.0" > $tmp_dir/debian-binary |