Patchwork [meta-oe] jq: upgrade to 1.4

login
register
mail settings
Submitter Matthieu CRAPET
Date July 29, 2014, 12:40 p.m.
Message ID <1406637609-27046-1-git-send-email-Matthieu.Crapet@ingenico.com>
Download mbox | patch
Permalink /patch/76837/
State Accepted, archived
Headers show

Comments

Matthieu CRAPET - July 29, 2014, 12:40 p.m.
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
Martin Jansa - July 30, 2014, 12:27 p.m.
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
Matthieu CRAPET - July 31, 2014, 8:56 a.m.
Martin,

Sorry I forgot a git diff. Please replace with patch v2 in master-next.
Thanks for your work.

Matthieu
Martin Jansa - July 31, 2014, 10:07 a.m.
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.

Patch

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"