From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 2 May 2011 12:53:32 +0000 (+0000)
Subject: quilt: fix building with dash `test x == x` gives a syntax error with dash (standard... 
X-Git-Tag: reboot~16810
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8324bf036c736a49b0d27612ba08d9596556a7cf;p=openwrt%2Fstaging%2Fxback.git

quilt: fix building with dash `test x == x` gives a syntax error with dash (standard in Debian). The modified patch reflects the current upstream: git.savannah.gnu.org/cgit/quilt.git/commit/?id=38df0b210c3df67f3e784af92232ae1946b98ecd

SVN-Revision: 26804
---

diff --git a/tools/quilt/patches/100-patch_2.6.1_version.patch b/tools/quilt/patches/100-patch_2.6.1_version.patch
index 84f275318c..1e9ed75df1 100644
--- a/tools/quilt/patches/100-patch_2.6.1_version.patch
+++ b/tools/quilt/patches/100-patch_2.6.1_version.patch
@@ -1,11 +1,15 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -274,7 +274,7 @@ fi
+@@ -274,7 +274,11 @@ fi
  AC_MSG_CHECKING([the version of $PATCH])
  if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
    set -- `$PATCH --version 2> /dev/null`
 -  patch_version=$2
-+  test $2 == "patch" && patch_version=$3 || patch_version=$2
++  if test x$1 = xGNU ; then
++    patch_version=$3
++  else
++    patch_version=$2
++  fi
    AC_MSG_RESULT($patch_version)
    saved_IFS=$IFS; IFS='.'
    set -- $patch_version