* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:08 [PATCH] expat: update to upstream version 2.1.0 Marko Lindqvist
@ 2012-05-10 21:24 ` Khem Raj
2012-05-10 21:43 ` Marko Lindqvist
2012-05-10 21:36 ` Martin Jansa
2012-05-10 21:38 ` Scott Garman
2 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2012-05-10 21:24 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, May 10, 2012 at 2:08 PM, Marko Lindqvist <cazfi74@gmail.com> wrote:
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
> .../recipes-core/expat/expat-2.0.1/autotools.patch | 21 -----------------
> .../recipes-core/expat/expat-2.1.0/autotools.patch | 24 ++++++++++++++++++++
> meta/recipes-core/expat/expat_2.0.1.bb | 6 -----
> meta/recipes-core/expat/expat_2.1.0.bb | 6 +++++
> 4 files changed, 30 insertions(+), 27 deletions(-)
> delete mode 100644 meta/recipes-core/expat/expat-2.0.1/autotools.patch
> create mode 100644 meta/recipes-core/expat/expat-2.1.0/autotools.patch
> delete mode 100644 meta/recipes-core/expat/expat_2.0.1.bb
> create mode 100644 meta/recipes-core/expat/expat_2.1.0.bb
>
some of them I moves so may be you should have use -M option when
generating this patch but it looks ok otherwise.
> diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
> deleted file mode 100644
> index c0ac10b..0000000
> --- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Avoid using expat's m4 files
> -
> -Upstream-Status: Inappropriate [Other]
> -Workaround specific to our build system.
> -
> -Signed-off-by: Kevin Tian <kevin.tian@intel.com>
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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 @@
> -
> - AC_CONFIG_HEADER(expat_config.h)
> -
> --sinclude(conftools/libtool.m4)
> --sinclude(conftools/ac_c_bigendian_cross.m4)
> --
> - AC_LIBTOOL_WIN32_DLL
> - AC_PROG_LIBTOOL
> -
> diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
> new file mode 100644
> index 0000000..0e59969
> --- /dev/null
> +++ b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
> @@ -0,0 +1,24 @@
> +Avoid using expat's m4 files
> +
> +Upstream-Status: Inappropriate [Other]
> +Workaround specific to our build system.
> +
> +Signed-off-by: Kevin Tian <kevin.tian@intel.com>
> +Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> +
> +Updated to apply over expat 2.1.0
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +
> +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/ac_c_bigendian_cross.m4)
> +-
> + AC_LIBTOOL_WIN32_DLL
> + AC_PROG_LIBTOOL
> +
> 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..727769f
> --- /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 = "r1"
> +
PR could be reset to 0
> +SRC_URI[md5sum] = "dd7dab7a5fea97d2a6a43f511449b7cd"
> +SRC_URI[sha256sum] = "823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
> --
> 1.7.10
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:24 ` Khem Raj
@ 2012-05-10 21:43 ` Marko Lindqvist
2012-05-10 21:49 ` Scott Garman
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Marko Lindqvist @ 2012-05-10 21:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
.../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
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 <kevin.tian@intel.com>
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-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 <cazfi74@gmail.com>
+
+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"
--
1.7.10
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:43 ` Marko Lindqvist
@ 2012-05-10 21:49 ` Scott Garman
2012-05-10 23:32 ` Marko Lindqvist
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Scott Garman @ 2012-05-10 21:49 UTC (permalink / raw)
To: openembedded-core
On 05/10/2012 02:43 PM, Marko Lindqvist wrote:
> Signed-off-by: Marko Lindqvist<cazfi74@gmail.com>
> ---
> .../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
Thanks! I'll build-test this overnight and give it an Ack tomorrow
morning if all goes well.
Scott
>
> 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<kevin.tian@intel.com>
> Signed-off-by: Scott Garman<scott.a.garman@intel.com>
>
> -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<cazfi74@gmail.com>
> +
> +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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:43 ` Marko Lindqvist
2012-05-10 21:49 ` Scott Garman
@ 2012-05-10 23:32 ` Marko Lindqvist
2012-05-10 23:43 ` Khem Raj
2012-05-15 20:42 ` Scott Garman
2012-05-16 18:01 ` Saul Wold
3 siblings, 1 reply; 12+ messages in thread
From: Marko Lindqvist @ 2012-05-10 23:32 UTC (permalink / raw)
To: openembedded-core
I see new version ended as new patch to patchwork even though I set
In-Reply-To header. How does this work correctly?
- ML
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 23:32 ` Marko Lindqvist
@ 2012-05-10 23:43 ` Khem Raj
0 siblings, 0 replies; 12+ messages in thread
From: Khem Raj @ 2012-05-10 23:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, May 10, 2012 at 4:32 PM, Marko Lindqvist <cazfi74@gmail.com> wrote:
> I see new version ended as new patch to patchwork even though I set
> In-Reply-To header. How does this work correctly?
each patch is tracked separately in patchwork. Ideally the submitter
or whoever is working on patch should remove the old patch as
superceded but we dont use patchwork for applying patches on OE-Core.
Its actively used for meta-oe
for oe-core its just capturing the patches for people to
look through them. The patches are picked from mailing lists or pull requests.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:43 ` Marko Lindqvist
2012-05-10 21:49 ` Scott Garman
2012-05-10 23:32 ` Marko Lindqvist
@ 2012-05-15 20:42 ` Scott Garman
2012-05-16 18:01 ` Saul Wold
3 siblings, 0 replies; 12+ messages in thread
From: Scott Garman @ 2012-05-15 20:42 UTC (permalink / raw)
To: openembedded-core
On 05/10/2012 02:43 PM, Marko Lindqvist wrote:
> Signed-off-by: Marko Lindqvist<cazfi74@gmail.com>
> ---
> .../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 <scott.a.garman@intel.com>
Acked-by: Scott Garman <scott.a.garman@intel.com>
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<kevin.tian@intel.com>
> Signed-off-by: Scott Garman<scott.a.garman@intel.com>
>
> -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<cazfi74@gmail.com>
> +
> +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
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:43 ` Marko Lindqvist
` (2 preceding siblings ...)
2012-05-15 20:42 ` Scott Garman
@ 2012-05-16 18:01 ` Saul Wold
3 siblings, 0 replies; 12+ messages in thread
From: Saul Wold @ 2012-05-16 18:01 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 05/11/2012 12:43 AM, Marko Lindqvist wrote:
> Signed-off-by: Marko Lindqvist<cazfi74@gmail.com>
> ---
> .../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
>
> 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<kevin.tian@intel.com>
> Signed-off-by: Scott Garman<scott.a.garman@intel.com>
>
> -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<cazfi74@gmail.com>
> +
> +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"
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:08 [PATCH] expat: update to upstream version 2.1.0 Marko Lindqvist
2012-05-10 21:24 ` Khem Raj
@ 2012-05-10 21:36 ` Martin Jansa
2012-05-10 21:38 ` Scott Garman
2 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-05-10 21:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 4073 bytes --]
On Fri, May 11, 2012 at 12:08:48AM +0300, Marko Lindqvist wrote:
> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> ---
> .../recipes-core/expat/expat-2.0.1/autotools.patch | 21 -----------------
> .../recipes-core/expat/expat-2.1.0/autotools.patch | 24 ++++++++++++++++++++
> meta/recipes-core/expat/expat_2.0.1.bb | 6 -----
> meta/recipes-core/expat/expat_2.1.0.bb | 6 +++++
> 4 files changed, 30 insertions(+), 27 deletions(-)
> delete mode 100644 meta/recipes-core/expat/expat-2.0.1/autotools.patch
> create mode 100644 meta/recipes-core/expat/expat-2.1.0/autotools.patch
> delete mode 100644 meta/recipes-core/expat/expat_2.0.1.bb
> create mode 100644 meta/recipes-core/expat/expat_2.1.0.bb
>
> diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
> deleted file mode 100644
> index c0ac10b..0000000
> --- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Avoid using expat's m4 files
> -
> -Upstream-Status: Inappropriate [Other]
> -Workaround specific to our build system.
> -
> -Signed-off-by: Kevin Tian <kevin.tian@intel.com>
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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 @@
> -
> - AC_CONFIG_HEADER(expat_config.h)
> -
> --sinclude(conftools/libtool.m4)
> --sinclude(conftools/ac_c_bigendian_cross.m4)
> --
> - AC_LIBTOOL_WIN32_DLL
> - AC_PROG_LIBTOOL
> -
> diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
> new file mode 100644
> index 0000000..0e59969
> --- /dev/null
> +++ b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
> @@ -0,0 +1,24 @@
> +Avoid using expat's m4 files
> +
> +Upstream-Status: Inappropriate [Other]
> +Workaround specific to our build system.
> +
> +Signed-off-by: Kevin Tian <kevin.tian@intel.com>
> +Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> +
> +Updated to apply over expat 2.1.0
> +
> +Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
> +
> +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/ac_c_bigendian_cross.m4)
> +-
> + AC_LIBTOOL_WIN32_DLL
> + AC_PROG_LIBTOOL
> +
> 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..727769f
> --- /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 = "r1"
Please reset this to r0 or remove PR completely (as r0 is default)
> +
> +SRC_URI[md5sum] = "dd7dab7a5fea97d2a6a43f511449b7cd"
> +SRC_URI[sha256sum] = "823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
> --
> 1.7.10
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:08 [PATCH] expat: update to upstream version 2.1.0 Marko Lindqvist
2012-05-10 21:24 ` Khem Raj
2012-05-10 21:36 ` Martin Jansa
@ 2012-05-10 21:38 ` Scott Garman
2012-05-10 21:49 ` Marko Lindqvist
2 siblings, 1 reply; 12+ messages in thread
From: Scott Garman @ 2012-05-10 21:38 UTC (permalink / raw)
To: openembedded-core
On 05/10/2012 02:08 PM, Marko Lindqvist wrote:
> Signed-off-by: Marko Lindqvist<cazfi74@gmail.com>
> ---
> .../recipes-core/expat/expat-2.0.1/autotools.patch | 21 -----------------
> .../recipes-core/expat/expat-2.1.0/autotools.patch | 24 ++++++++++++++++++++
> meta/recipes-core/expat/expat_2.0.1.bb | 6 -----
> meta/recipes-core/expat/expat_2.1.0.bb | 6 +++++
> 4 files changed, 30 insertions(+), 27 deletions(-)
> delete mode 100644 meta/recipes-core/expat/expat-2.0.1/autotools.patch
> create mode 100644 meta/recipes-core/expat/expat-2.1.0/autotools.patch
> delete mode 100644 meta/recipes-core/expat/expat_2.0.1.bb
> create mode 100644 meta/recipes-core/expat/expat_2.1.0.bb
Hi Marko,
As the maintainer of the expat recipe, I appreciate your submission.
However I'm a bit wary of removing the autotools patch - have you build
tested this change for all of our QEMU architectures? I think it may
still be needed.
Scott
>
> diff --git a/meta/recipes-core/expat/expat-2.0.1/autotools.patch b/meta/recipes-core/expat/expat-2.0.1/autotools.patch
> deleted file mode 100644
> index c0ac10b..0000000
> --- a/meta/recipes-core/expat/expat-2.0.1/autotools.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Avoid using expat's m4 files
> -
> -Upstream-Status: Inappropriate [Other]
> -Workaround specific to our build system.
> -
> -Signed-off-by: Kevin Tian<kevin.tian@intel.com>
> -Signed-off-by: Scott Garman<scott.a.garman@intel.com>
> -
> -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 @@
> -
> - AC_CONFIG_HEADER(expat_config.h)
> -
> --sinclude(conftools/libtool.m4)
> --sinclude(conftools/ac_c_bigendian_cross.m4)
> --
> - AC_LIBTOOL_WIN32_DLL
> - AC_PROG_LIBTOOL
> -
> diff --git a/meta/recipes-core/expat/expat-2.1.0/autotools.patch b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
> new file mode 100644
> index 0000000..0e59969
> --- /dev/null
> +++ b/meta/recipes-core/expat/expat-2.1.0/autotools.patch
> @@ -0,0 +1,24 @@
> +Avoid using expat's m4 files
> +
> +Upstream-Status: Inappropriate [Other]
> +Workaround specific to our build system.
> +
> +Signed-off-by: Kevin Tian<kevin.tian@intel.com>
> +Signed-off-by: Scott Garman<scott.a.garman@intel.com>
> +
> +Updated to apply over expat 2.1.0
> +
> +Signed-off-by: Marko Lindqvist<cazfi74@gmail.com>
> +
> +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/ac_c_bigendian_cross.m4)
> +-
> + AC_LIBTOOL_WIN32_DLL
> + AC_PROG_LIBTOOL
> +
> 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..727769f
> --- /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 = "r1"
> +
> +SRC_URI[md5sum] = "dd7dab7a5fea97d2a6a43f511449b7cd"
> +SRC_URI[sha256sum] = "823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86"
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:38 ` Scott Garman
@ 2012-05-10 21:49 ` Marko Lindqvist
2012-05-10 21:52 ` Scott Garman
0 siblings, 1 reply; 12+ messages in thread
From: Marko Lindqvist @ 2012-05-10 21:49 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 11 May 2012 00:38, Scott Garman <scott.a.garman@intel.com> wrote:
>
> Hi Marko,
>
> As the maintainer of the expat recipe, I appreciate your submission. However
> I'm a bit wary of removing the autotools patch
Not removed, but adjusted to apply over expat-2.1.0.
However, part of the old patch was removal of libtool.m4 include from
configure.in, but new version leaves libtool handling to configure.in
as is.
So...
- have you build tested this
> change for all of our QEMU architectures? I think it may still be needed.
I'll do that during next couple of days.
- ML
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] expat: update to upstream version 2.1.0
2012-05-10 21:49 ` Marko Lindqvist
@ 2012-05-10 21:52 ` Scott Garman
0 siblings, 0 replies; 12+ messages in thread
From: Scott Garman @ 2012-05-10 21:52 UTC (permalink / raw)
To: openembedded-core
On 05/10/2012 02:49 PM, Marko Lindqvist wrote:
> On 11 May 2012 00:38, Scott Garman<scott.a.garman@intel.com> wrote:
>>
>> Hi Marko,
>>
>> As the maintainer of the expat recipe, I appreciate your submission. However
>> I'm a bit wary of removing the autotools patch
>
> Not removed, but adjusted to apply over expat-2.1.0.
>
> However, part of the old patch was removal of libtool.m4 include from
> configure.in, but new version leaves libtool handling to configure.in
> as is.
You're right, I guess I scanned the diff too quickly and read it mistakenly.
I can run it through my autobuilder overnight, so no worries about
testing. The upgrade looks pretty straightforward.
Scott
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 12+ messages in thread