Patchwork [2/2] quilt: fix test for target build

login
register
mail settings
Submitter Qing He
Date April 13, 2011, 9:26 a.m.
Message ID <b94c6ce5656dd4bd312feda0eaf2423cae505ccd.1302686656.git.qing.he@intel.com>
Download mbox | patch
Permalink /patch/2199/
State New, archived
Headers show

Comments

Qing He - April 13, 2011, 9:26 a.m.
From: Qing He <qing.he@intel.com>

fixes [YOCTO #969]

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../quilt/quilt/gnu_patch_test_fix_target.patch    |   66 ++++++++++++++++++++
 meta/recipes-devtools/quilt/quilt_0.48.bb          |    6 +-
 2 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
Khem Raj - April 13, 2011, 3:36 p.m.
On Wed, Apr 13, 2011 at 2:26 AM, Qing He <qing.he@intel.com> wrote:
> From: Qing He <qing.he@intel.com>
>
> fixes [YOCTO #969]
>
> Signed-off-by: Qing He <qing.he@intel.com>
> ---
>  .../quilt/quilt/gnu_patch_test_fix_target.patch    |   66 ++++++++++++++++++++
>  meta/recipes-devtools/quilt/quilt_0.48.bb          |    6 +-
>  2 files changed, 70 insertions(+), 2 deletions(-)
>  create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>
> diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
> new file mode 100644
> index 0000000..784fe76
> --- /dev/null
> +++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
> @@ -0,0 +1,66 @@
> +The test of patch and diff should not be run for cross build,
> +rather, assume them as gnu version is rather safe. This is a
> +workaround to remove it altogether.
> +

why is this patch needed. I assume all linux distributions use GNU
diff and patch
and that what is being checked so why remove the checks ? these messages
are atleast useful for folks who are trying other build hosts e.g. darwin

> +Signed-off-by: Qing He <qing.he@intel.com>
> +
> +diff --git a/configure.ac b/configure.ac
> +index 026a36c..7b45ca4 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -245,55 +245,6 @@ fi
> + QUILT_COMPAT_PROG_PATH(DIFF, diff)
> + QUILT_COMPAT_PROG_PATH(PATCH, patch)
> +
> +-# Sun diff and others will not work because GNU patch options are used.
> +-AC_MSG_CHECKING([the version of $DIFF])
> +-if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
> +-  set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'`
> +-  diff_version=$1
> +-  AC_MSG_RESULT($diff_version)
> +-  saved_IFS=$IFS; IFS='.'
> +-  set -- $diff_version
> +-  IFS=$saved_IFS
> +-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
> +-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 7 ; then
> +-    diff_version=
> +-  fi
> +-else
> +-  AC_MSG_RESULT(no GNU diff)
> +-fi
> +-if test -z "$diff_version" ; then
> +-  AC_MSG_ERROR([
> +-$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can
> +-download a current version of patch from ftp.gnu.org, or if you already
> +-have GNU diff then you can supply its path with the '--with-diff=' option.
> +-])
> +-fi
> +-
> +-
> +-# Sun's patch, and others, do not work because GNU patch options are used.
> +-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
> +-  AC_MSG_RESULT($patch_version)
> +-  saved_IFS=$IFS; IFS='.'
> +-  set -- $patch_version
> +-  IFS=$saved_IFS
> +-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
> +-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 4 ; then
> +-    patch_version=
> +-  fi
> +-else
> +-  AC_MSG_RESULT(no GNU patch)
> +-fi
> +-if test -z "$patch_version" ; then
> +-  AC_MSG_ERROR([
> +-$PACKAGE_NAME requires at least version 2.4 of GNU patch. You can download a
> +-current version of patch from ftp.gnu.org, or if you already have GNU patch
> +-then you can supply its path with the '--with-patch=' option.
> +-])
> +-fi
> +-
> + QUILT_COMPAT_PROG_PATH(FIND, find)
> +
> + AC_MSG_CHECKING([whether $FIND -path works])
> diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb
> index 20a708d..124e2cd 100644
> --- a/meta/recipes-devtools/quilt/quilt_0.48.bb
> +++ b/meta/recipes-devtools/quilt/quilt_0.48.bb
> @@ -2,8 +2,10 @@ require quilt.inc
>  LICENSE="GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
> -PR = "r0"
> -SRC_URI += "file://aclocal.patch"
> +PR = "r1"
> +SRC_URI += "file://aclocal.patch \
> +            file://gnu_patch_test_fix_target.patch \
> +           "
>
>  SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
>  SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
> --
> 1.7.0
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Saul Wold - April 13, 2011, 4:48 p.m.
On 04/13/2011 08:36 AM, Khem Raj wrote:
> On Wed, Apr 13, 2011 at 2:26 AM, Qing He<qing.he@intel.com>  wrote:
>> From: Qing He<qing.he@intel.com>
>>
>> fixes [YOCTO #969]
>>
>> Signed-off-by: Qing He<qing.he@intel.com>
>> ---
>>   .../quilt/quilt/gnu_patch_test_fix_target.patch    |   66 ++++++++++++++++++++
>>   meta/recipes-devtools/quilt/quilt_0.48.bb          |    6 +-
>>   2 files changed, 70 insertions(+), 2 deletions(-)
>>   create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>>
>> diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>> new file mode 100644
>> index 0000000..784fe76
>> --- /dev/null
>> +++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>> @@ -0,0 +1,66 @@
>> +The test of patch and diff should not be run for cross build,
>> +rather, assume them as gnu version is rather safe. This is a
>> +workaround to remove it altogether.
>> +
>
> why is this patch needed. I assume all linux distributions use GNU
> diff and patch
> and that what is being checked so why remove the checks ? these messages
> are atleast useful for folks who are trying other build hosts e.g. darwin
>
I understand the host vs target issue, but I think a safer way would  be 
to add a check for the version of the target patch (via a variable), 
this may be more upstreamable.

Also, why did you know do a recipe update which would bring in some of 
the upstream fixes also?

Sau!

>> +Signed-off-by: Qing He<qing.he@intel.com>
>> +
>> +diff --git a/configure.ac b/configure.ac
>> +index 026a36c..7b45ca4 100644
>> +--- a/configure.ac
>> ++++ b/configure.ac
>> +@@ -245,55 +245,6 @@ fi
>> + QUILT_COMPAT_PROG_PATH(DIFF, diff)
>> + QUILT_COMPAT_PROG_PATH(PATCH, patch)
>> +
>> +-# Sun diff and others will not work because GNU patch options are used.
>> +-AC_MSG_CHECKING([the version of $DIFF])
>> +-if $DIFF --version 2>/dev/null | grep GNU>/dev/null; then
>> +-  set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'`
>> +-  diff_version=$1
>> +-  AC_MSG_RESULT($diff_version)
>> +-  saved_IFS=$IFS; IFS='.'
>> +-  set -- $diff_version
>> +-  IFS=$saved_IFS
>> +-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
>> +-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 7 ; then
>> +-    diff_version=
>> +-  fi
>> +-else
>> +-  AC_MSG_RESULT(no GNU diff)
>> +-fi
>> +-if test -z "$diff_version" ; then
>> +-  AC_MSG_ERROR([
>> +-$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can
>> +-download a current version of patch from ftp.gnu.org, or if you already
>> +-have GNU diff then you can supply its path with the '--with-diff=' option.
>> +-])
>> +-fi
>> +-
>> +-
>> +-# Sun's patch, and others, do not work because GNU patch options are used.
>> +-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
>> +-  AC_MSG_RESULT($patch_version)
>> +-  saved_IFS=$IFS; IFS='.'
>> +-  set -- $patch_version
>> +-  IFS=$saved_IFS
>> +-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
>> +-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 4 ; then
>> +-    patch_version=
>> +-  fi
>> +-else
>> +-  AC_MSG_RESULT(no GNU patch)
>> +-fi
>> +-if test -z "$patch_version" ; then
>> +-  AC_MSG_ERROR([
>> +-$PACKAGE_NAME requires at least version 2.4 of GNU patch. You can download a
>> +-current version of patch from ftp.gnu.org, or if you already have GNU patch
>> +-then you can supply its path with the '--with-patch=' option.
>> +-])
>> +-fi
>> +-
>> + QUILT_COMPAT_PROG_PATH(FIND, find)
>> +
>> + AC_MSG_CHECKING([whether $FIND -path works])
>> diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb
>> index 20a708d..124e2cd 100644
>> --- a/meta/recipes-devtools/quilt/quilt_0.48.bb
>> +++ b/meta/recipes-devtools/quilt/quilt_0.48.bb
>> @@ -2,8 +2,10 @@ require quilt.inc
>>   LICENSE="GPLv2"
>>   LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>>   RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
>> -PR = "r0"
>> -SRC_URI += "file://aclocal.patch"
>> +PR = "r1"
>> +SRC_URI += "file://aclocal.patch \
>> +            file://gnu_patch_test_fix_target.patch \
>> +           "
>>
>>   SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
>>   SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
>> --
>> 1.7.0
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Qing He - April 14, 2011, 2 a.m.
On Wed, 2011-04-13 at 23:36 +0800, Khem Raj wrote:
> On Wed, Apr 13, 2011 at 2:26 AM, Qing He <qing.he@intel.com> wrote:
> > From: Qing He <qing.he@intel.com>
> >
> > fixes [YOCTO #969]
> >
> > Signed-off-by: Qing He <qing.he@intel.com>
> > ---
> > ??.../quilt/quilt/gnu_patch_test_fix_target.patch ?? ??| ?? 66 ++++++++++++++++++++
> > ??meta/recipes-devtools/quilt/quilt_0.48.bb ?? ?? ?? ?? ??| ?? ??6 +-
> > ??2 files changed, 70 insertions(+), 2 deletions(-)
> > ??create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
> >
> > diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
> > new file mode 100644
> > index 0000000..784fe76
> > --- /dev/null
> > +++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
> > @@ -0,0 +1,66 @@
> > +The test of patch and diff should not be run for cross build,
> > +rather, assume them as gnu version is rather safe. This is a
> > +workaround to remove it altogether.
> > +
> 
> why is this patch needed. I assume all linux distributions use GNU
> diff and patch
> and that what is being checked so why remove the checks ? these messages
> are atleast useful for folks who are trying other build hosts e.g. darwin

Because patch is used at runtime rather than build time. It is used
mainly in patch-wrapper and some other scripts.

configure.ac of quilt practically doesn't differentiate them,
this leads to problems in cross-compiling:
  1. the QUILT_COMPAT_PROG_PATH finds the wrong patch, say we are
     building on darwin with a non-GNU patch, host patch found in
     /usr/bin or /sw/bin is irrelevant, what should be tested is
     <target sysroot>/path/to/patch(which may not be /usr/bin), and
     then @PATCH@ should be set to a value with <target sysroot>
     removed.
  2. the test is performed by running "patch --version", this obviously
     doesn't work for cross-compiling.

The right way to do this may be something like:
  if test "x$cross_compiling" = "xyes"; then
    AC_CHECK_PROG in target sysroot
    PATCH=strip sysroot in the absolute path
  else
    QUILT_COPAT_PROG_PATH
    original test
  fi

This is troublesome and error prone, since a separate SYSROOT needs to
be handled by configure, and target patch may as well not in a standard
path. The simplest way to do it is to remove the test, as we have
separate recipes for quilt and quilt-native.


The reason to touch this part of code is that the test itself doesn't
work for newer versions of GNU patch, see:
  http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html
This surely fixes the configure error, but is logically not suitable for
cross compiling.

Thanks,
Qing
Khem Raj - April 14, 2011, 3:23 p.m.
On Wed, Apr 13, 2011 at 7:00 PM, Qing He <qing.he@intel.com> wrote:
> On Wed, 2011-04-13 at 23:36 +0800, Khem Raj wrote:
>> On Wed, Apr 13, 2011 at 2:26 AM, Qing He <qing.he@intel.com> wrote:
>> > From: Qing He <qing.he@intel.com>
>> >
>> > fixes [YOCTO #969]
>> >
>> > Signed-off-by: Qing He <qing.he@intel.com>
>> > ---
>> > ??.../quilt/quilt/gnu_patch_test_fix_target.patch ?? ??| ?? 66 ++++++++++++++++++++
>> > ??meta/recipes-devtools/quilt/quilt_0.48.bb ?? ?? ?? ?? ??| ?? ??6 +-
>> > ??2 files changed, 70 insertions(+), 2 deletions(-)
>> > ??create mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>> >
>> > diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>> > new file mode 100644
>> > index 0000000..784fe76
>> > --- /dev/null
>> > +++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
>> > @@ -0,0 +1,66 @@
>> > +The test of patch and diff should not be run for cross build,
>> > +rather, assume them as gnu version is rather safe. This is a
>> > +workaround to remove it altogether.
>> > +
>>
>> why is this patch needed. I assume all linux distributions use GNU
>> diff and patch
>> and that what is being checked so why remove the checks ? these messages
>> are atleast useful for folks who are trying other build hosts e.g. darwin
>
> Because patch is used at runtime rather than build time. It is used
> mainly in patch-wrapper and some other scripts.
>
> configure.ac of quilt practically doesn't differentiate them,
> this leads to problems in cross-compiling:
>  1. the QUILT_COMPAT_PROG_PATH finds the wrong patch, say we are
>     building on darwin with a non-GNU patch, host patch found in
>     /usr/bin or /sw/bin is irrelevant, what should be tested is
>     <target sysroot>/path/to/patch(which may not be /usr/bin), and
>     then @PATCH@ should be set to a value with <target sysroot>
>     removed.
>  2. the test is performed by running "patch --version", this obviously
>     doesn't work for cross-compiling.
>
> The right way to do this may be something like:
>  if test "x$cross_compiling" = "xyes"; then
>    AC_CHECK_PROG in target sysroot
>    PATCH=strip sysroot in the absolute path
>  else
>    QUILT_COPAT_PROG_PATH
>    original test
>  fi
>
> This is troublesome and error prone, since a separate SYSROOT needs to
> be handled by configure, and target patch may as well not in a standard
> path. The simplest way to do it is to remove the test, as we have
> separate recipes for quilt and quilt-native.
>
>
> The reason to touch this part of code is that the test itself doesn't
> work for newer versions of GNU patch, see:
>  http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html
> This surely fixes the configure error, but is logically not suitable for
> cross compiling.

As I understand you are trying to fix quilt target recipe. Then may it
will be better to take the above
patch for both target and native but apply this
workaround conditionally only for target recipe

there are options --with-patch --with-diff also
there to point these utilities
>
> Thanks,
> Qing
>
Qing He - April 15, 2011, 9:19 a.m.
On Thu, 2011-04-14 at 23:23 +0800, Khem Raj wrote:
> > The reason to touch this part of code is that the test itself doesn't
> > work for newer versions of GNU patch, see:
> > ??http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html
> > This surely fixes the configure error, but is logically not suitable for
> > cross compiling.
> 
> As I understand you are trying to fix quilt target recipe. Then may it
> will be better to take the above
> patch for both target and native but apply this
> workaround conditionally only for target recipe

This was once backported, but subsequently reverted, see:
  http://git.pokylinux.org/cgit/cgit.cgi/poky/commit/?id=ec740ac770d2124cbae1ab936d85b8343076c53b

autoconf-native is not available at the point of quilt-native, so
autoreconf is not desirable. This is also the reason for separation
of quilt and quilt-native from the very beginning.

Apart from that, the workaround is solely for target recipe.

> 
> there are options --with-patch --with-diff also
> there to point these utilities

The problem still lies in cross building:
  --with-patch=${bindir}/patch          at build time, it's /usr/bin/patch
                                        which is host utility, if target
					${bindir} /= /usr/bin, the file
					may not exist.

  --with-patch=${STAGING_BINDIR}/patch  causes runtime error as
                                        ${STAGING_BINDIR} leaks into target scripts

  --with-patch=patch                    this may work, but may fail (in case
                                        the target scripts unset PATH)

This is the problem of such tests without the concept of a target
sysroot.

Thanks,
Qing
Khem Raj - April 15, 2011, 2:22 p.m.
On Fri, Apr 15, 2011 at 2:19 AM, Qing He <qing.he@intel.com> wrote:
> On Thu, 2011-04-14 at 23:23 +0800, Khem Raj wrote:
>> > The reason to touch this part of code is that the test itself doesn't
>> > work for newer versions of GNU patch, see:
>> > ??http://lists.nongnu.org/archive/html/quilt-dev/2010-06/msg00002.html
>> > This surely fixes the configure error, but is logically not suitable for
>> > cross compiling.
>>
>> As I understand you are trying to fix quilt target recipe. Then may it
>> will be better to take the above
>> patch for both target and native but apply this
>> workaround conditionally only for target recipe
>
> This was once backported, but subsequently reverted, see:
>  http://git.pokylinux.org/cgit/cgit.cgi/poky/commit/?id=ec740ac770d2124cbae1ab936d85b8343076c53b
>
> autoconf-native is not available at the point of quilt-native, so
> autoreconf is not desirable. This is also the reason for separation
> of quilt and quilt-native from the very beginning.


So you regenerate configure and add that to patch too along with .ac
file and then it should not regenerate it.

>
> Apart from that, the workaround is solely for target recipe.
>
>>
>> there are options --with-patch --with-diff also
>> there to point these utilities
>
> The problem still lies in cross building:
>  --with-patch=${bindir}/patch          at build time, it's /usr/bin/patch
>                                        which is host utility, if target
>                                        ${bindir} /= /usr/bin, the file
>                                        may not exist.
>
>  --with-patch=${STAGING_BINDIR}/patch  causes runtime error as
>                                        ${STAGING_BINDIR} leaks into target scripts
>
>  --with-patch=patch                    this may work, but may fail (in case
>                                        the target scripts unset PATH)
>
> This is the problem of such tests without the concept of a target
> sysroot.
>


this is fine we can apply this conditionally for target recipe.

> Thanks,
> Qing
>

Patch

diff --git a/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
new file mode 100644
index 0000000..784fe76
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix_target.patch
@@ -0,0 +1,66 @@ 
+The test of patch and diff should not be run for cross build,
+rather, assume them as gnu version is rather safe. This is a
+workaround to remove it altogether.
+
+Signed-off-by: Qing He <qing.he@intel.com>
+
+diff --git a/configure.ac b/configure.ac
+index 026a36c..7b45ca4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,55 +245,6 @@ fi
+ QUILT_COMPAT_PROG_PATH(DIFF, diff)
+ QUILT_COMPAT_PROG_PATH(PATCH, patch)
+ 
+-# Sun diff and others will not work because GNU patch options are used.
+-AC_MSG_CHECKING([the version of $DIFF])
+-if $DIFF --version 2>/dev/null | grep GNU >/dev/null; then
+-  set -- `$DIFF --version 2>/dev/null | $AWK '{ print $NF; exit }'`
+-  diff_version=$1
+-  AC_MSG_RESULT($diff_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $diff_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 7 ; then
+-    diff_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU diff)
+-fi
+-if test -z "$diff_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.7 of GNU diffutils. You can
+-download a current version of patch from ftp.gnu.org, or if you already
+-have GNU diff then you can supply its path with the '--with-diff=' option.
+-])
+-fi
+-
+-
+-# Sun's patch, and others, do not work because GNU patch options are used.
+-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
+-  AC_MSG_RESULT($patch_version)
+-  saved_IFS=$IFS; IFS='.'
+-  set -- $patch_version
+-  IFS=$saved_IFS
+-  set -- `echo $1 | $TR -cd 0-9` `echo $2 | $TR -cd 0-9`
+-  if test 0$1 -lt 2 || test 0$1 -eq 2 -a 0$2 -lt 4 ; then
+-    patch_version=
+-  fi
+-else
+-  AC_MSG_RESULT(no GNU patch)
+-fi
+-if test -z "$patch_version" ; then
+-  AC_MSG_ERROR([
+-$PACKAGE_NAME requires at least version 2.4 of GNU patch. You can download a
+-current version of patch from ftp.gnu.org, or if you already have GNU patch
+-then you can supply its path with the '--with-patch=' option.
+-])
+-fi
+-
+ QUILT_COMPAT_PROG_PATH(FIND, find)
+ 
+ AC_MSG_CHECKING([whether $FIND -path works])
diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb
index 20a708d..124e2cd 100644
--- a/meta/recipes-devtools/quilt/quilt_0.48.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.48.bb
@@ -2,8 +2,10 @@  require quilt.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r0"
-SRC_URI += "file://aclocal.patch"
+PR = "r1"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"