[dunfell,16/42] libpcre/libpcre2: correct SRC_URI

Message ID a1bb6b60bbde7da4496db1a2f7e48bbfb637fa4e.1638136329.git.steve@sakoman.com
State Accepted, archived
Commit a1bb6b60bbde7da4496db1a2f7e48bbfb637fa4e
Headers show
Series [dunfell,01/42] linux-yocto/5.4: update to v5.4.154 | expand

Commit Message

Steve Sakoman Nov. 28, 2021, 9:57 p.m. UTC
From: Alexander Kanavin <alex.kanavin@gmail.com>

http://ftp.pcre.org is down, take sources according to links on
http://www.pcre.org

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 81ba0ba3e8d9c08b8dc69c24fb1d91446739229b)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-support/libpcre/libpcre2_10.34.bb | 2 +-
 meta/recipes-support/libpcre/libpcre_8.44.bb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

jhorns@ics.com Dec. 17, 2021, 7:33 p.m. UTC | #1
Dunfell uses 10.34 pcre2. This SRC_URI does not work with 10.34, as that version is not available there.

Does Dunfell need to be updated to pcre2 > 10.36?
Steve Sakoman Dec. 17, 2021, 11:16 p.m. UTC | #2
On Fri, Dec 17, 2021 at 9:33 AM <jhorns@ics.com> wrote:
>
> Dunfell uses 10.34 pcre2. This SRC_URI does not work with 10.34, as that version is not available there.

Urghh . . .you are correct.

It does look like sourceforge is still carrying this (as do a few
other random mirrors):

https://downloads.sourceforge.net/pcre/pcre2-10.34.tar.bz2

Any thoughts on which to use Alex?

>
> Does Dunfell need to be updated to pcre2 > 10.36?

No, I think we should stick with the current version since this is a
stable release.

Steve

> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#159836): https://lists.openembedded.org/g/openembedded-core/message/159836
> Mute This Topic: https://lists.openembedded.org/mt/87365168/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexander Kanavin Dec. 17, 2021, 11:39 p.m. UTC | #3
I’d suggest we host the tarball somewhere on yoctoproject.org actually.

Alex

On Sat 18. Dec 2021 at 2.16, Steve Sakoman <steve@sakoman.com> wrote:

> On Fri, Dec 17, 2021 at 9:33 AM <jhorns@ics.com> wrote:
> >
> > Dunfell uses 10.34 pcre2. This SRC_URI does not work with 10.34, as that
> version is not available there.
>
> Urghh . . .you are correct.
>
> It does look like sourceforge is still carrying this (as do a few
> other random mirrors):
>
> https://downloads.sourceforge.net/pcre/pcre2-10.34.tar.bz2
>
> Any thoughts on which to use Alex?
>
> >
> > Does Dunfell need to be updated to pcre2 > 10.36?
>
> No, I think we should stick with the current version since this is a
> stable release.
>
> Steve
>
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#159836):
> https://lists.openembedded.org/g/openembedded-core/message/159836
> > Mute This Topic: https://lists.openembedded.org/mt/87365168/3620601
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> steve@sakoman.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
Richard Purdie Dec. 18, 2021, 10:24 p.m. UTC | #4
On Sat, 2021-12-18 at 02:39 +0300, Alexander Kanavin wrote:
> I’d suggest we host the tarball somewhere on yoctoproject.org actually.

You mean like 

http://downloads.yoctoproject.org/mirror/sources/pcre2-10.34.tar.bz2 

? :)

Cheers,

Richard

Patch

diff --git a/meta/recipes-support/libpcre/libpcre2_10.34.bb b/meta/recipes-support/libpcre/libpcre2_10.34.bb
index fa8655e027..cbbb632f87 100644
--- a/meta/recipes-support/libpcre/libpcre2_10.34.bb
+++ b/meta/recipes-support/libpcre/libpcre2_10.34.bb
@@ -10,7 +10,7 @@  SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=b1588d3bb4cb0e1f5a597d908f8c5b37"
 
-SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre2-${PV}.tar.bz2 \
+SRC_URI = "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-${PV}/pcre2-${PV}.tar.bz2 \
            file://pcre-cross.patch \
 "
 
diff --git a/meta/recipes-support/libpcre/libpcre_8.44.bb b/meta/recipes-support/libpcre/libpcre_8.44.bb
index cd80dc7345..3267c5ad72 100644
--- a/meta/recipes-support/libpcre/libpcre_8.44.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.44.bb
@@ -7,7 +7,7 @@  HOMEPAGE = "http://www.pcre.org"
 SECTION = "devel"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENCE;md5=3bb381a66a5385b246d4877922e7511e"
-SRC_URI = "https://ftp.pcre.org/pub/pcre/pcre-${PV}.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2 \
            file://run-ptest \
            file://Makefile \
            "