* [PATCH 0/1] fix bug 690: quilt-native build failure on opensuse 11.3
@ 2011-02-01 7:43 Qing He
2011-02-01 7:43 ` [PATCH 1/1] quilt: fix patch version detection Qing He
0 siblings, 1 reply; 3+ messages in thread
From: Qing He @ 2011-02-01 7:43 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
The new patch version on OpenSuSE 11.3 causes the configure script to fail.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: qhe/fix
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=qhe/fix
Thanks,
Qing He <qing.he@intel.com>
---
Qing He (1):
quilt: fix patch version detection
meta/recipes-devtools/quilt/quilt-native_0.48.bb | 2 +-
meta/recipes-devtools/quilt/quilt.inc | 3 +-
.../quilt/quilt/patch-version-detection.patch | 29 ++++++++++++++++++++
meta/recipes-devtools/quilt/quilt_0.48.bb | 2 +-
4 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] quilt: fix patch version detection
2011-02-01 7:43 [PATCH 0/1] fix bug 690: quilt-native build failure on opensuse 11.3 Qing He
@ 2011-02-01 7:43 ` Qing He
2011-02-01 14:55 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Qing He @ 2011-02-01 7:43 UTC (permalink / raw)
To: poky
From: Qing He <qing.he@intel.com>
Fixes [BUGID #690]
Signed-off-by: Qing He <qing.he@intel.com>
---
meta/recipes-devtools/quilt/quilt-native_0.48.bb | 2 +-
meta/recipes-devtools/quilt/quilt.inc | 3 +-
.../quilt/quilt/patch-version-detection.patch | 29 ++++++++++++++++++++
meta/recipes-devtools/quilt/quilt_0.48.bb | 2 +-
4 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-devtools/quilt/quilt/patch-version-detection.patch
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.48.bb b/meta/recipes-devtools/quilt/quilt-native_0.48.bb
index a62531e..3cfe395 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 4542511..e2cfce4 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 0000000..878a953
--- /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</td>
+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 a2a8a5c..6f5e2bc 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"
--
1.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] quilt: fix patch version detection
2011-02-01 7:43 ` [PATCH 1/1] quilt: fix patch version detection Qing He
@ 2011-02-01 14:55 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-02-01 14:55 UTC (permalink / raw)
To: Qing He; +Cc: poky
On Tue, 2011-02-01 at 15:43 +0800, Qing He wrote:
> From: Qing He <qing.he@intel.com>
>
> Fixes [BUGID #690]
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-01 14:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-01 7:43 [PATCH 0/1] fix bug 690: quilt-native build failure on opensuse 11.3 Qing He
2011-02-01 7:43 ` [PATCH 1/1] quilt: fix patch version detection Qing He
2011-02-01 14:55 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.