gstreamer1.0-plugins-rs: fix upstream tag check
PATCH 1/4 gstreamer1.0-plugins-rs: fix upstream tag check
From: Alexander Kanavin <[email protected]>
Upstream maintains two sets of tags: one of the actual releases and another to align with and match gstreamer C versions:
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/tags
Somewhat counter-intuitively, the latter is intended only for gstreamer's own use (to make binary releases), and distributions and packagers should use the former. The regex tweak ensures that, as aligned versions sort higher and need to be excluded.
--- .../gstreamer/gstreamer1.0-plugins-rs_0.15.3.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-rs_0.15.3.bb +1 -0
@@ -7,6 +7,7 @@ SRC_URI += "\ git://gitlab.freedesktop.org/gstreamer/gst-plugins-rs;protocol=https;tag=${PV};nobranch=1;name=default \ " SRCREV = "6302bea23b53e6461c104f9543df887a63b2d6ec" +UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)" LIC_FILES_CHKSUM = " \ file://${BPN}-${PV}/LICENSE-MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad \
Signature · 1 line
2.47.3
PATCH 2/4 tzcode/tzdata: fix upstream version check
From: Alexander Kanavin <[email protected]>
The webpage no longer lists tarballs directly, but the actual directory with them can again be listed.
--- meta/recipes-extended/timezone/timezone.inc | 2 -- 1 file changed, 2 deletions(-)
meta/recipes-extended/timezone/timezone.inc +0 -2
@@ -14,7 +14,5 @@ SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz S = "${UNPACKDIR}/tz" -UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" - SRC_URI[tzcode.sha256sum] = "b1cffc3ace4c4c7cd0efba2f7add86ec3d0b79da48bcf03582671fd3c8feace8" SRC_URI[tzdata.sha256sum] = "e4a178a4477f3d0ea77cc31828ff72aa38feff8d61aa13e7e99e142e9d902be4"
Signature · 1 line
2.47.3
PATCH 3/4 tcl: update domain: tcl.tk -> tcl-lang.org
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
tcl.tk is no longer accessible (and .tk is generally problematic:
https://en.wikipedia.org/wiki/.tk ).
--- meta/recipes-devtools/tcltk/tcl_9.0.4.bb | 4 ++-- meta/recipes-devtools/tcltk8/tcl8_8.6.18.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-devtools/tcltk/tcl_9.0.4.bb +2 -2
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tcl.sourceforge.net" DESCRIPTION = "Tool Command Language, is an open-source multi-purpose C library which includes a powerful dynamic scripting language. Together they provide ideal cross-platform development environment for any programming project." SECTION = "devel/tcltk" -# http://www.tcl.tk/software/tcltk/license.html +# http://www.tcl-lang.org/software/tcltk/license.html LICENSE = "BSD-3-Clause AND TCL" LIC_FILES_CHKSUM = "file://license.terms;md5=058f6229798281bbcac4239c788cfa38 \ file://compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
@@ -24,7 +24,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/tcl/tcl-core${PV}-src.tar.gz \ " SRC_URI[sha256sum] = "5d265f3499b588681825d8093177830707b7035ad866b17189a3a6ab6dade0ff" -UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html" +UPSTREAM_CHECK_URI = "https://www.tcl-lang.org/software/tcltk/download.html" UPSTREAM_CHECK_REGEX = "tcl(?P<pver>\d+(\.\d+)+)-src" S = "${UNPACKDIR}/${BPN}${PV}"
meta/recipes-devtools/tcltk8/tcl8_8.6.18.bb +2 -2
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tcl.sourceforge.net" DESCRIPTION = "Tool Command Language, is an open-source multi-purpose C library which includes a powerful dynamic scripting language. Together they provide ideal cross-platform development environment for any programming project." SECTION = "devel/tcltk" -# http://www.tcl.tk/software/tcltk/license.html +# http://www.tcl-lang.org/software/tcltk/license.html LICENSE = "BSD-3-Clause AND TCL" LIC_FILES_CHKSUM = "file://license.terms;md5=058f6229798281bbcac4239c788cfa38 \ file://compat/license.terms;md5=058f6229798281bbcac4239c788cfa38 \
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "1880b6337de72431174511419550bb4cf1327b7c8200a5466d1c4eb3ec SRC_URI:class-native = "${BASE_SRC_URI}" -UPSTREAM_CHECK_URI = "https://www.tcl.tk/software/tcltk/download.html" +UPSTREAM_CHECK_URI = "https://www.tcl-lang.org/software/tcltk/download.html" UPSTREAM_CHECK_REGEX = "tcl(?P<pver>8(\.\d+)+)-src" S = "${UNPACKDIR}/tcl${PV}"
Signature · 1 line
2.47.3
PATCH 4/4 libfyaml: correct upstream version check
In reply to Alexander KanavinFrom: Alexander Kanavin <[email protected]>
- GITHUB_BASE_URI should include 'releases' component of the uri
- the regex should exclude various alphas, betas and pre-releases:
https://github.com/pantoniou/libfyaml/releases
--- meta/recipes-support/libfyaml/libfyaml_0.9.6.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-support/libfyaml/libfyaml_0.9.6.bb +3 -2
@@ -3,8 +3,9 @@ HOMEPAGE = "https://github.com/pantoniou/libfyaml" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6399094fbc639a289cfca2d660c010aa" -GITHUB_BASE_URI = "https://github.com/pantoniou/libfyaml" -SRC_URI = "${GITHUB_BASE_URI}/releases/download/v${PV}/libfyaml-${PV}.tar.gz \ +GITHUB_BASE_URI = "https://github.com/pantoniou/libfyaml/releases" +UPSTREAM_CHECK_REGEX ?= "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libfyaml-${PV}.tar.gz \ file://0001-Fix-32-bit-build-by-removing-stray-parameter-to-fy_s.patch \ file://0002-vlsize-Handle-decoding-when-size_t-sizeof-uint64_t.patch \ file://0001-build-don-t-output-none-required-to-LIBM-if-no-linke.patch \
Signature · 1 line
2.47.3
Re: [OE-core] [PATCH 4/4] libfyaml: correct upstream version check
meta/recipes-support/libfyaml/libfyaml_0.9.6.bb HOMEPAGE = "https://github.com/pantoniou/libfyaml" · line 8
Quoted 5 lines · Alexander Kanavin via lists.openembedded.org
meta/recipes-support/libfyaml/libfyaml_0.9.6.bb +3
-2-GITHUB_BASE_URI = "https://github.com/pantoniou/libfyaml" -SRC_URI = "${GITHUB_BASE_URI}/releases/download/v${PV}/libfyaml-${PV}.tar.gz \ +GITHUB_BASE_URI = "https://github.com/pantoniou/libfyaml/releases" +UPSTREAM_CHECK_REGEX ?= "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libfyaml-${PV}.tar.gz \
Isn’t that UPSTREAM_CHECK_REGEX the same as the value in github-releases.bbclass?
Ross
Re: [OE-core] [PATCH 4/4] libfyaml: correct upstream version check
Quoted 7 lines · Ross Burton
meta/recipes-support/libfyaml/libfyaml_0.9.6.bb HOMEPAGE = "https://github.com/pantoniou/libfyaml" · line 8
Quoted 5 lines
meta/recipes-support/libfyaml/libfyaml_0.9.6.bb +3
-2-GITHUB_BASE_URI = "https://github.com/pantoniou/libfyaml" -SRC_URI = "${GITHUB_BASE_URI}/releases/download/v${PV}/libfyaml-${PV}.tar.gz \ +GITHUB_BASE_URI = "https://github.com/pantoniou/libfyaml/releases" +UPSTREAM_CHECK_REGEX ?= "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libfyaml-${PV}.tar.gz \Isn’t that
UPSTREAM_CHECK_REGEXthe same as the value in github-releases.bbclass?
The regex in the class doesn't have a $ at the end which pulls in alphas betas and pre's. Maybe this could simply += a $ to it instead?
Alex