summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2011-02-01 15:37:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-01 14:55:18 +0000
commitbc31351f6989372c7feb403f23532afd1f510fb1 (patch)
tree3b07cac7566db889b7af6a4b754a9dd934b6605e /meta/recipes-devtools
parentd6f4d682c0d51e13418ea3ab2ad75793c5e00324 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-devtools/quilt/quilt-native_0.48.bb2
-rw-r--r--meta/recipes-devtools/quilt/quilt.inc3
-rw-r--r--meta/recipes-devtools/quilt/quilt/patch-version-detection.patch29
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.48.bb2
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 a62531e39d..3cfe3959c5 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 @@
1require quilt.inc 1require quilt.inc
2require quilt-native.inc 2require quilt-native.inc
3 3
4PR = "r0" 4PR = "r1"
5 5
6SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" 6SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
7SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc" 7SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 45425116af..e2cfce4a06 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"
6 6
7SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \ 7SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
8 file://install.patch \ 8 file://install.patch \
9 file://gnu_patch_test_fix.patch" 9 file://gnu_patch_test_fix.patch \
10 file://patch-version-detection.patch"
10 11
11inherit autotools 12inherit autotools
12 13
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 0000000000..8b84f812b5
--- /dev/null
+++ b/meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
@@ -0,0 +1,29 @@
1From: Jean Delvare
2Subject: [Quilt-dev] [PACH] Fix patch version detection
3Date: Mon, 21 Jun 2010 13:49:50 +0200
4
5New versions of GNU patch present themselves as "GNU patch" instead
6of just "patch".
7---
8 configure.ac | 6 +++++-
9 1 file changed, 5 insertions(+), 1 deletion(-)
10
11--- a/configure.ac
12+++ b/configure.ac
13@@ -262,7 +262,11 @@ fi
14 AC_MSG_CHECKING([the version of $PATCH])
15 if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
16 set -- `$PATCH --version 2> /dev/null`
17- patch_version=$2
18+ if test x$1 = xGNU ; then
19+ patch_version=$3
20+ else
21+ patch_version=$2
22+ fi
23 AC_MSG_RESULT($patch_version)
24 saved_IFS=$IFS; IFS='.'
25 set -- $patch_version
26
27--
28Jean Delvare
29Suse L3
diff --git a/meta/recipes-devtools/quilt/quilt_0.48.bb b/meta/recipes-devtools/quilt/quilt_0.48.bb
index a2a8a5ce34..6f5e2bc10f 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
2LICENSE="GPLv2" 2LICENSE="GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" 4RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
5PR = "r0" 5PR = "r1"
6SRC_URI += "file://aclocal.patch" 6SRC_URI += "file://aclocal.patch"
7 7
8SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b" 8SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"