From: Dominic Sacré <dominic.sacre@gmx.de>
Date: Mon, 27 Jul 2015 15:34:23 +0000 (+0200)
Subject: opkg-utils: fix bashism in opkg-build
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~29584
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cf2242fc30b3d1ceb538ff5106e000cd888652e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

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 e8250b71236..4dddb08c96d 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
 +