Skip to contentSkip to conversation

json-c: use GitHub for upstream release checking

PATCH Superseded Ross Burton 3 participants 5 messages Sep 20, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 json-c: use GitHub for upstream release checking

---
 meta/recipes-devtools/json-c/json-c_0.13.1.bb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
meta/recipes-devtools/json-c/json-c_0.13.1.bb +1 -7
index 9654e60a3d2..fcc3e4337ea 100644
@@ -10,13 +10,7 @@ SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
 SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350"
 SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873"
 
-UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar"
-# json-c releases page is fetching the list of releases in some weird XML format
-# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
-#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
-RECIPE_UPSTREAM_VERSION = "0.13.1"
-RECIPE_UPSTREAM_DATE = "Mar 04, 2018"
-CHECK_DATE = "May 02, 2018"
+UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 
 RPROVIDES_${PN} = "libjson"
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 json-c: clean up recipe

Tidy the indentation of EXTRA_OECONF.

Remove the deletion of config.status which hasn't been in the tarballs since 0.12.

---
 meta/recipes-devtools/json-c/json-c_0.13.1.bb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
meta/recipes-devtools/json-c/json-c_0.13.1.bb +1 -7
index fcc3e4337ea..38a150f4abf 100644
@@ -16,12 +16,6 @@ RPROVIDES_${PN} = "libjson"
 
 inherit autotools
 
-EXTRA_OECONF = "--disable-werror \
-                "
-
-do_configure_prepend() {
-    # Clean up autoconf cruft that should not be in the tarball
-    rm -f ${S}/config.status
-}
+EXTRA_OECONF = "--disable-werror"
 
 BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.20.1
#2 lore raw
In reply to Ross Burton
Quoted 12 lines · Ross Burton
---
 meta/recipes-devtools/json-c/json-c_0.13.1.bb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
meta/recipes-devtools/json-c/json-c_0.13.1.bb +0 -0
index 9654e60a3d2..fcc3e4337ea 100644
@@ -10,13 +10,7 @@ SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \
 SRC_URI[md5sum] = "04969ad59cc37bddd83741a08b98f350"
 SRC_URI[sha256sum] = "b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873"

meta/recipes-devtools/json-c/json-c_0.13.1.bb SRC_URI = "https://s3.amazonaws.com/json-c_releases/releases/${BP}.tar.gz \ · line 13

Quoted 10 lines
meta/recipes-devtools/json-c/json-c_0.13.1.bb +1 -7
 
-UPSTREAM_CHECK_REGEX = "json-c-(?P<pver>\d+(\.\d+)+).tar"
-# json-c releases page is fetching the list of releases in some weird XML format
-# from https://s3.amazonaws.com/json-c_releases and processes it with javascript :-/
-#UPSTREAM_CHECK_URI = "https://s3.amazonaws.com/json-c_releases/releases/index.html"
-RECIPE_UPSTREAM_VERSION = "0.13.1"
-RECIPE_UPSTREAM_DATE = "Mar 04, 2018"
-CHECK_DATE = "May 02, 2018"
+UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
...

Upstream tag names are appending the date to the version, making "devtool check-upgrade-status" with this patch result in
INFO: json-c 0.13.1 UNKNOWN_BROKEN Yi Zhao <[email protected]>

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw
Quoted 3 lines · Adrian Bunk

Upstream tag names are appending the date to the version, making "devtool check-upgrade-status" with this patch result in
INFO: json-c 0.13.1 UNKNOWN_BROKEN Yi Zhao <[email protected]>

I totally tested this and it worked, somehow. Obviously my tool is broken!

V2 incoming...

Ross

#4 lore raw

✗ patchtest: failure for "json-c: use GitHub for upstrea..." and 1 more

In reply to Ross Burton

== Series Details ==

Series: "json-c: use GitHub for upstrea..." and 1 more
Revision: 1
URL : https://patchwork.openembedded.org/series/20079/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 95ad562629)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe