mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

opkg-utils: fix bashism in opkg-build

Browse Source 
Fix error '[[: not found' if /bin/sh is not bash.

This issue was introduced by the recent addition of tar_ignore_error.patch
to the opkg-utils recipe.

(From OE-Core rev: 2cf2242fc30b3d1ceb538ff5106e000cd888652e)

Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dominic Sacré
2015-07-27 17:34:23 +02:00
committed by Richard Purdie
parent 5981ccff2e
commit 5d8739f52b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch
View File

@@ -32,13 +32,13 @@ Index: git/opkg-build
+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file +# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
+rc=0 +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 -cz $tarformat -f $tmp_dir/data.tar.gz . ) || rc=$?
+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then +if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
+ exit $rc + exit $rc
+fi +fi
+ +
+rc=0 +rc=0
+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$? +( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$?
+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then +if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
+ exit $rc + exit $rc
+fi +fi
+ +