diff options
| author |   Qing He <qing.he@intel.com> | 2011-02-01 15:37:54 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-01 14:55:18 +0000 |
| commit | bc31351f6989372c7feb403f23532afd1f510fb1 (patch) | |
| tree | 3b07cac7566db889b7af6a4b754a9dd934b6605e /meta/recipes-devtools/quilt | |
| parent | d6f4d682c0d51e13418ea3ab2ad75793c5e00324 (diff) | |
| download | openembedded-core-contrib-bc31351f6989372c7feb403f23532afd1f510fb1.tar.gz | |
quilt: fix patch version detection
Fixes [BUGID #690]
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-devtools/quilt')
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.48.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt/patch-version-detection.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.48.bb | 2 |
4 files changed, 33 insertions, 3 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.48.bb b/meta/recipes-devtools/quilt/quilt-native_0.48.bb index a62531e39d0..3cfe3959c51 100644 --- a/meta/recipes-devtools/quilt/quilt-native_0.48.bb +++ b/meta/recipes-devtools/quilt/quilt-native_0.48.bb @@ -1,7 +1,7 @@ require quilt.inc require quilt-native.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 45425116af5..e2cfce4a065 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ file://install.patch \ - file://gnu_patch_test_fix.patch" + file://gnu_patch_test_fix.patch \ + file://patch-version-detection.patch" inherit autotools diff --git a/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch new file mode 100644 index 00000000000..8b84f812b59 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch @@ -0,0 +1,29 @@ +From: Jean Delvare +Subject: [Quilt-dev] [PACH] Fix patch version detection +Date: Mon, 21 Jun 2010 13:49:50 +0200 + +New versions of GNU patch present themselves as "GNU patch" instead +of just "patch". +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -262,7 +262,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 ++ 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 + +-- +Jean Delvare +Suse L3 diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb index a2a8a5ce344..6f5e2bc10f4 100644 --- a/meta/recipes-devtools/quilt/quilt_0.48.bb +++ b/meta/recipes-devtools/quilt/quilt_0.48.bb @@ -2,7 +2,7 @@ require quilt.inc LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -PR = "r0" +PR = "r1" SRC_URI += "file://aclocal.patch" SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" |