On 05/10/2012 02:43 PM, Marko Lindqvist wrote:
Signed-off-by: Marko Lindqvist<[email protected]>
---
.../expat/{expat-2.0.1 => expat-2.1.0}/autotools.patch | 13
++++++++-----
meta/recipes-core/expat/expat_2.0.1.bb | 6 ------
meta/recipes-core/expat/expat_2.1.0.bb | 6 ++++++
3 files changed, 14 insertions(+), 11 deletions(-)
rename meta/recipes-core/expat/{expat-2.0.1 => expat-2.1.0}/autotools.patch
(53%)
delete mode 100644 meta/recipes-core/expat/expat_2.0.1.bb
create mode 100644 meta/recipes-core/expat/expat_2.1.0.bb
Tested-by: Scott Garman <[email protected]>
Acked-by: Scott Garman <[email protected]>
Richard/Saul, if it's easier for you to cherry-pick, I have the patch in
a git tree here:
http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=sgarman/expat-upgrade-oe
diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
similarity index 53%
rename from meta/recipes-core/expat/expat-2.0.1/autotools.patch
rename to meta/recipes-core/expat/expat-2.1.0/autotools.patch
index c0ac10b..0e59969 100644
--- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
+++ b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
@@ -6,14 +6,17 @@ Workaround specific to our build system.
Signed-off-by: Kevin Tian<[email protected]>
Signed-off-by: Scott Garman<[email protected]>
-diff -bur expat-2.0.0~orig/configure.in expat-2.0.0/configure.in
---- expat-2.0.0~orig/configure.in 2006-01-10 19:10:46.000000000 -0600
-+++ expat-2.0.0/configure.in 2006-02-10 19:12:24.000000000 -0600
-@@ -50,9 +50,6 @@
+Updated to apply over expat 2.1.0
+
+Signed-off-by: Marko Lindqvist<[email protected]>
+
+diff -Nurd expat-2.1.0/configure.in expat-2.1.0/configure.in
+--- expat-2.1.0/configure.in 2012-03-04 01:45:53.000000000 +0200
++++ expat-2.1.0/configure.in 2012-05-10 21:04:44.000000000 +0300
+@@ -51,8 +51,6 @@
AC_CONFIG_HEADER(expat_config.h)
--sinclude(conftools/libtool.m4)
-sinclude(conftools/ac_c_bigendian_cross.m4)
-
AC_LIBTOOL_WIN32_DLL
diff --git a/meta/recipes-core/expat/expat_2.0.1.bb
b/meta/recipes-core/expat/expat_2.0.1.bb
deleted file mode 100644
index 30b5684..0000000
--- a/meta/recipes-core/expat/expat_2.0.1.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require expat.inc
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
-PR = "r1"
-
-SRC_URI[md5sum] = "ee8b492592568805593f81f8cdf2a04c"
-SRC_URI[sha256sum] =
"847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93"
diff --git a/meta/recipes-core/expat/expat_2.1.0.bb
b/meta/recipes-core/expat/expat_2.1.0.bb
new file mode 100644
index 0000000..1ce1844
--- /dev/null
+++ b/meta/recipes-core/expat/expat_2.1.0.bb
@@ -0,0 +1,6 @@
+require expat.inc
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b71f681713d1256e1c23b0890920874"
+PR = "r0"
+
+SRC_URI[md5sum] = "dd7dab7a5fea97d2a6a43f511449b7cd"
+SRC_URI[sha256sum] =
"823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
