From 2cf2242fc30b3d1ceb538ff5106e000cd888652e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominic=20Sacr=C3=A9?= Date: Mon, 27 Jul 2015 17:34:23 +0200 Subject: opkg-utils: fix bashism in opkg-build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg-utils/opkg-utils/tar_ignore_error.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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 + -- cgit v1.2.3