* [meta-oe][PATCH] jq: upgrade to 1.4
@ 2014-07-29 12:40 Matthieu Crapet
2014-07-30 12:27 ` Martin Jansa
2014-07-31 8:52 ` [meta-oe][PATCH v2] " Matthieu Crapet
0 siblings, 2 replies; 6+ messages in thread
From: Matthieu Crapet @ 2014-07-29 12:40 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
.../jq/files/automake-once-fix.patch | 29 ----------------------
meta-oe/recipes-devtools/jq/jq_1.3.bb | 23 -----------------
meta-oe/recipes-devtools/jq/jq_1.4.bb | 23 +++++++++++++++++
3 files changed, 23 insertions(+), 52 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
delete mode 100644 meta-oe/recipes-devtools/jq/jq_1.3.bb
create mode 100644 meta-oe/recipes-devtools/jq/jq_1.4.bb
diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
deleted file mode 100644
index 0a1d1a2..0000000
--- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Applied
-https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a
-
-Fixes build with automake-1.14
-
-diff --git a/configure.ac b/configure.ac
-index 76a49a9..d6d2d38 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie],
- dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
- AC_PREREQ([2.61])
- AC_CONFIG_AUX_DIR([config])
--AM_INIT_AUTOMAKE([parallel-tests foreign])
-+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall])
- AM_SILENT_RULES([yes])
- AC_PROG_CC
- AC_PROG_CC_STDC
-@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
-
- dnl AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE([-Wall])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
-
---
-1.8.5.4
-
diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.3.bb
deleted file mode 100644
index c58b472..0000000
--- a/meta-oe/recipes-devtools/jq/jq_1.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Lightweight and flexible command-line JSON processor"
-DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \
- filter and map and transform structured data with the same \
- ease that sed, awk, grep and friends let you play with text."
-HOMEPAGE = "http://stedolan.github.io/jq/"
-BUGTRACKER = "https://github.com/stedolan/jq/issues"
-SECTION = "utils"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
-
-DEPENDS = "flex-native bison-native"
-
-SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
- file://automake-once-fix.patch \
-"
-SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d"
-SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7"
-
-inherit autotools
-
-# Don't build documentation (generation requires ruby)
-EXTRA_OECONF = "--disable-docs"
diff --git a/meta-oe/recipes-devtools/jq/jq_1.4.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb
new file mode 100644
index 0000000..c58b472
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb
@@ -0,0 +1,23 @@
+SUMMARY = "Lightweight and flexible command-line JSON processor"
+DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \
+ filter and map and transform structured data with the same \
+ ease that sed, awk, grep and friends let you play with text."
+HOMEPAGE = "http://stedolan.github.io/jq/"
+BUGTRACKER = "https://github.com/stedolan/jq/issues"
+SECTION = "utils"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
+
+DEPENDS = "flex-native bison-native"
+
+SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
+ file://automake-once-fix.patch \
+"
+SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d"
+SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7"
+
+inherit autotools
+
+# Don't build documentation (generation requires ruby)
+EXTRA_OECONF = "--disable-docs"
--
2.0.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] jq: upgrade to 1.4
2014-07-29 12:40 [meta-oe][PATCH] jq: upgrade to 1.4 Matthieu Crapet
@ 2014-07-30 12:27 ` Martin Jansa
2014-07-31 8:56 ` Matthieu CRAPET
2014-07-31 8:52 ` [meta-oe][PATCH v2] " Matthieu Crapet
1 sibling, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2014-07-30 12:27 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 4653 bytes --]
On Tue, Jul 29, 2014 at 02:40:09PM +0200, Matthieu Crapet wrote:
> Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
> ---
> .../jq/files/automake-once-fix.patch | 29 ----------------------
> meta-oe/recipes-devtools/jq/jq_1.3.bb | 23 -----------------
> meta-oe/recipes-devtools/jq/jq_1.4.bb | 23 +++++++++++++++++
> 3 files changed, 23 insertions(+), 52 deletions(-)
> delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
> delete mode 100644 meta-oe/recipes-devtools/jq/jq_1.3.bb
> create mode 100644 meta-oe/recipes-devtools/jq/jq_1.4.bb
>
> diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
> deleted file mode 100644
> index 0a1d1a2..0000000
> --- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -Upstream-Status: Applied
> -https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a
> -
> -Fixes build with automake-1.14
> -
> -diff --git a/configure.ac b/configure.ac
> -index 76a49a9..d6d2d38 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie],
> - dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
> - AC_PREREQ([2.61])
> - AC_CONFIG_AUX_DIR([config])
> --AM_INIT_AUTOMAKE([parallel-tests foreign])
> -+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall])
> - AM_SILENT_RULES([yes])
> - AC_PROG_CC
> - AC_PROG_CC_STDC
> -@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
> -
> - dnl AC_CONFIG_MACRO_DIR([m4])
> - AC_CONFIG_HEADERS(config.h)
> --AM_INIT_AUTOMAKE([-Wall])
> - AC_CONFIG_FILES([Makefile])
> - AC_OUTPUT
> -
> ---
> -1.8.5.4
> -
> diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.3.bb
> deleted file mode 100644
> index c58b472..0000000
> --- a/meta-oe/recipes-devtools/jq/jq_1.3.bb
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -SUMMARY = "Lightweight and flexible command-line JSON processor"
> -DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \
> - filter and map and transform structured data with the same \
> - ease that sed, awk, grep and friends let you play with text."
> -HOMEPAGE = "http://stedolan.github.io/jq/"
> -BUGTRACKER = "https://github.com/stedolan/jq/issues"
> -SECTION = "utils"
> -
> -LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
> -
> -DEPENDS = "flex-native bison-native"
> -
> -SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
> - file://automake-once-fix.patch \
> -"
> -SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d"
> -SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7"
> -
> -inherit autotools
> -
> -# Don't build documentation (generation requires ruby)
> -EXTRA_OECONF = "--disable-docs"
> diff --git a/meta-oe/recipes-devtools/jq/jq_1.4.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb
> new file mode 100644
> index 0000000..c58b472
> --- /dev/null
> +++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb
> @@ -0,0 +1,23 @@
> +SUMMARY = "Lightweight and flexible command-line JSON processor"
> +DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \
> + filter and map and transform structured data with the same \
> + ease that sed, awk, grep and friends let you play with text."
> +HOMEPAGE = "http://stedolan.github.io/jq/"
> +BUGTRACKER = "https://github.com/stedolan/jq/issues"
> +SECTION = "utils"
> +
> +LICENSE = "MIT"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
> +
> +DEPENDS = "flex-native bison-native"
> +
> +SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
> + file://automake-once-fix.patch \
^ you have removed this file, but you still have it in SRC_URI, fix it
and resend with -M.
> +"
> +SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d"
> +SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7"
> +
> +inherit autotools
> +
> +# Don't build documentation (generation requires ruby)
> +EXTRA_OECONF = "--disable-docs"
> --
> 2.0.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCH v2] jq: upgrade to 1.4
2014-07-29 12:40 [meta-oe][PATCH] jq: upgrade to 1.4 Matthieu Crapet
2014-07-30 12:27 ` Martin Jansa
@ 2014-07-31 8:52 ` Matthieu Crapet
1 sibling, 0 replies; 6+ messages in thread
From: Matthieu Crapet @ 2014-07-31 8:52 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
.../jq/files/automake-once-fix.patch | 29 ----------------------
meta-oe/recipes-devtools/jq/jq_1.3.bb | 23 -----------------
meta-oe/recipes-devtools/jq/jq_1.4.bb | 22 ++++++++++++++++
3 files changed, 22 insertions(+), 52 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
delete mode 100644 meta-oe/recipes-devtools/jq/jq_1.3.bb
create mode 100644 meta-oe/recipes-devtools/jq/jq_1.4.bb
diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
deleted file mode 100644
index 0a1d1a2..0000000
--- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Applied
-https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a
-
-Fixes build with automake-1.14
-
-diff --git a/configure.ac b/configure.ac
-index 76a49a9..d6d2d38 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie],
- dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
- AC_PREREQ([2.61])
- AC_CONFIG_AUX_DIR([config])
--AM_INIT_AUTOMAKE([parallel-tests foreign])
-+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall])
- AM_SILENT_RULES([yes])
- AC_PROG_CC
- AC_PROG_CC_STDC
-@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
-
- dnl AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE([-Wall])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
-
---
-1.8.5.4
-
diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.3.bb
deleted file mode 100644
index c58b472..0000000
--- a/meta-oe/recipes-devtools/jq/jq_1.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-SUMMARY = "Lightweight and flexible command-line JSON processor"
-DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \
- filter and map and transform structured data with the same \
- ease that sed, awk, grep and friends let you play with text."
-HOMEPAGE = "http://stedolan.github.io/jq/"
-BUGTRACKER = "https://github.com/stedolan/jq/issues"
-SECTION = "utils"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
-
-DEPENDS = "flex-native bison-native"
-
-SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
- file://automake-once-fix.patch \
-"
-SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d"
-SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7"
-
-inherit autotools
-
-# Don't build documentation (generation requires ruby)
-EXTRA_OECONF = "--disable-docs"
diff --git a/meta-oe/recipes-devtools/jq/jq_1.4.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb
new file mode 100644
index 0000000..6e50803
--- /dev/null
+++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Lightweight and flexible command-line JSON processor"
+DESCRIPTION = "jq is like sed for JSON data, you can use it to slice and \
+ filter and map and transform structured data with the same \
+ ease that sed, awk, grep and friends let you play with text."
+HOMEPAGE = "http://stedolan.github.io/jq/"
+BUGTRACKER = "https://github.com/stedolan/jq/issues"
+SECTION = "utils"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
+
+DEPENDS = "flex-native bison-native"
+
+SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
+"
+SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f"
+SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d"
+
+inherit autotools
+
+# Don't build documentation (generation requires ruby)
+EXTRA_OECONF = "--disable-docs"
--
2.0.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] jq: upgrade to 1.4
2014-07-30 12:27 ` Martin Jansa
@ 2014-07-31 8:56 ` Matthieu CRAPET
2014-07-31 10:07 ` Martin Jansa
0 siblings, 1 reply; 6+ messages in thread
From: Matthieu CRAPET @ 2014-07-31 8:56 UTC (permalink / raw)
To: openembedded-devel@lists.openembedded.org
Martin,
Sorry I forgot a git diff. Please replace with patch v2 in master-next.
Thanks for your work.
Matthieu
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [meta-oe][PATCH] jq: upgrade to 1.4
2014-07-31 8:56 ` Matthieu CRAPET
@ 2014-07-31 10:07 ` Martin Jansa
2014-07-31 12:42 ` [meta-oe][PATCH v3] " Matthieu Crapet
0 siblings, 1 reply; 6+ messages in thread
From: Martin Jansa @ 2014-07-31 10:07 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
On Thu, Jul 31, 2014 at 08:56:04AM +0000, Matthieu CRAPET wrote:
> Martin,
>
> Sorry I forgot a git diff. Please replace with patch v2 in master-next.
> Thanks for your work.
Was it sent with -M? It doesn't look so.
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [meta-oe][PATCH v3] jq: upgrade to 1.4
2014-07-31 10:07 ` Martin Jansa
@ 2014-07-31 12:42 ` Matthieu Crapet
0 siblings, 0 replies; 6+ messages in thread
From: Matthieu Crapet @ 2014-07-31 12:42 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
---
.../jq/files/automake-once-fix.patch | 29 ----------------------
.../recipes-devtools/jq/{jq_1.3.bb => jq_1.4.bb} | 5 ++--
2 files changed, 2 insertions(+), 32 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
rename meta-oe/recipes-devtools/jq/{jq_1.3.bb => jq_1.4.bb} (79%)
diff --git a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch b/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
deleted file mode 100644
index 0a1d1a2..0000000
--- a/meta-oe/recipes-devtools/jq/files/automake-once-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Applied
-https://github.com/stedolan/jq/commit/f0d1c39b5bbb4ccc517773eb635ba7f38ec7da1a
-
-Fixes build with automake-1.14
-
-diff --git a/configure.ac b/configure.ac
-index 76a49a9..d6d2d38 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@ AC_INIT([jq], [1.3], [mu@netsoc.tcd.ie],
- dnl Created autoconf implementation thompson@dtosolutions, 26NOV12
- AC_PREREQ([2.61])
- AC_CONFIG_AUX_DIR([config])
--AM_INIT_AUTOMAKE([parallel-tests foreign])
-+AM_INIT_AUTOMAKE([parallel-tests foreign -Wall])
- AM_SILENT_RULES([yes])
- AC_PROG_CC
- AC_PROG_CC_STDC
-@@ -66,7 +66,6 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
-
- dnl AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE([-Wall])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
-
---
-1.8.5.4
-
diff --git a/meta-oe/recipes-devtools/jq/jq_1.3.bb b/meta-oe/recipes-devtools/jq/jq_1.4.bb
similarity index 79%
rename from meta-oe/recipes-devtools/jq/jq_1.3.bb
rename to meta-oe/recipes-devtools/jq/jq_1.4.bb
index c58b472..6e50803 100644
--- a/meta-oe/recipes-devtools/jq/jq_1.3.bb
+++ b/meta-oe/recipes-devtools/jq/jq_1.4.bb
@@ -12,10 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=244a1fb9cf472474a062d67069dec653"
DEPENDS = "flex-native bison-native"
SRC_URI = "http://stedolan.github.io/${BPN}/download/source/${BP}.tar.gz \
- file://automake-once-fix.patch \
"
-SRC_URI[md5sum] = "26081b05d22525eca5cbdd8f9f4db17d"
-SRC_URI[sha256sum] = "623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7"
+SRC_URI[md5sum] = "e3c75a4f805bb5342c9f4b3603fb248f"
+SRC_URI[sha256sum] = "998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d"
inherit autotools
--
2.0.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-31 12:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-29 12:40 [meta-oe][PATCH] jq: upgrade to 1.4 Matthieu Crapet
2014-07-30 12:27 ` Martin Jansa
2014-07-31 8:56 ` Matthieu CRAPET
2014-07-31 10:07 ` Martin Jansa
2014-07-31 12:42 ` [meta-oe][PATCH v3] " Matthieu Crapet
2014-07-31 8:52 ` [meta-oe][PATCH v2] " Matthieu Crapet
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.