summaryrefslogtreecommitdiff
path: root/meta/recipes-devtools
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:28:23 +0100
commit2cf2242fc30b3d1ceb538ff5106e000cd888652e (patch)
tree3810a666a017ea5fb2721e64e4bdfec583cd2ec5 /meta/recipes-devtools
parentee16cb0a3f40384f509083f0ef3f36b68f73b7cf (diff)
downloadopenembedded-core-2cf2242fc30b3d1ceb538ff5106e000cd888652e.tar.gz
openembedded-core-2cf2242fc30b3d1ceb538ff5106e000cd888652e.tar.bz2
openembedded-core-2cf2242fc30b3d1ceb538ff5106e000cd888652e.zip
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. Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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
+# 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 -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
+fi
+
+rc=0
+( 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
+fi
+