summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominic Sacré <dominic.sacre@gmx.de>2015-07-27 17:34:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-27 23:29:16 +0100
commit5d8739f52b3ffb45ef42fcb4dd971044220c41ad (patch)
treed2367af9b68e48ffe81799d61a663c975eea9092
parent5981ccff2e963928834c0e47094c62038945472d (diff)
downloadpoky-5d8739f52b3ffb45ef42fcb4dd971044220c41ad.tar.gz
opkg-utils: fix bashism in opkg-build
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>
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch4
1 files changed, 2 insertions, 2 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 e8250b7123..4dddb08c96 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
@@ -32,13 +32,13 @@ Index: git/opkg-build
32+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file 32+# Ignore error code 1, caused by modifying the number of hard links while creating the tar file
33+rc=0 33+rc=0
34+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . ) || rc=$? 34+( cd $pkg_dir && tar $ogargs -X $tmp_dir/tarX -cz $tarformat -f $tmp_dir/data.tar.gz . ) || rc=$?
35+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then 35+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
36+ exit $rc 36+ exit $rc
37+fi 37+fi
38+ 38+
39+rc=0 39+rc=0
40+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$? 40+( cd $pkg_dir/$CONTROL && tar $ogargs -cz $tarformat -f $tmp_dir/control.tar.gz . ) || rc=$?
41+if [[ $rc -ne 1 ]] && [[ $rc -ne 0 ]] ;then 41+if [ $rc -ne 1 ] && [ $rc -ne 0 ]; then
42+ exit $rc 42+ exit $rc
43+fi 43+fi
44+ 44+