diff options
| author |   Alejandro del Castillo <alejandro.delcastillo@ni.com> | 2018-02-28 14:36:45 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-03 17:08:28 +0000 |
| commit | fd551c5ad4c82f295470f278c524d55562a67a28 (patch) | |
| tree | 6245c02df33a690d5bf7b455582e3afa6c9ce71a /meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | |
| parent | 151094f603ad817a5106360d1f51656fbe271121 (diff) | |
| download | openembedded-core-contrib-fd551c5ad4c82f295470f278c524d55562a67a28.tar.gz | |
opkg-utils: upgrade to version 0.3.6
0.3.5 -> 0.3.6
Patches:
- Add support for tar versions that don't support --sort
- Use local time when setting the modication time on the archives
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
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 | 13 |
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> Index: git/opkg-build + =================================================================== --- git.orig/opkg-build +++ git/opkg-build -@@ -250,8 +250,21 @@ tmp_dir=$dest_dir/IPKG_BUILD.$$ - mkdir $tmp_dir +@@ -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 -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) --( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) +-( 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 -X $tmp_dir/tarX -c --$compressor $tarformat -f $tmp_dir/data.tar.$cext . ) || rc=$? ++( 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 -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$? ++( 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 |