[oe-commits] =?UTF-8?Q?Dominic=20Sacr=C3=A9=20?=: opkg-utils: fix bashism in opkg-build

git at git.openembedded.org git at git.openembedded.org
Mon Jul 27 17:05:38 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: 6b70a66e14f000fb8059f59bc69a88bb85d20343
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6b70a66e14f000fb8059f59bc69a88bb85d20343

Author: Dominic Sacré <dominic.sacre at gmx.de>
Date:   Mon Jul 27 17:34:23 2015 +0200

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 at gmx.de>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | 4 ++--
 1 file 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 e8250b7..4dddb08 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
 +



More information about the Openembedded-commits mailing list