[meta-oe] imlib2: update SRC_URI

Message ID 20220510092824.2033312-1-nicolas.dechesne@linaro.org
State Under Review
Headers show
Series [meta-oe] imlib2: update SRC_URI | expand

Commit Message

Nicolas Dechesne May 10, 2022, 9:28 a.m. UTC
The upstream repo location has changed, it's now
https://git.enlightenment.org/old/legacy-imlib2

It's not clear when or why it happened, but the the commit hash we use
in SRCREV exists in the 'new' location, so let's at least update the
SRC_URI for now, and fix this warning:

WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL git://git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master, attempting MIRRORS if available

Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
---
 meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas Dechesne May 16, 2022, 5:45 p.m. UTC | #1
On Mon, May 16, 2022 at 6:09 PM Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On 5/16/22 8:28 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
> > 2022. 05. 10. 11:28 keltezéssel, Nicolas Dechesne írta:
> >> The upstream repo location has changed, it's now
> >> https://git.enlightenment.org/old/legacy-imlib2
> >
> > This hits every branch in meta-openembedded, not only master.
> >
>
> A different patch fixing same thing is already in master.
>

This is the merged patch, e.g.
62becef1091d (imlib2: update SRC_URI)

Not sure what you meant. And yes, it's needed in all branches. Do you
want/need a patch for this, or can you backport/apply directly?

>
> >>
> >> It's not clear when or why it happened, but the the commit hash we use
> >> in SRCREV exists in the 'new' location, so let's at least update the
> >> SRC_URI for now, and fix this warning:
> >>
> >> WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL
> >> git://
> git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master,
> >> attempting MIRRORS if available
> >>
> >> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
> >> ---
> >>   meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
> >> b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
> >> index 56d41cd39..869f8123d 100644
> >> --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
> >> +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
> >> @@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package
> >>   AUTO_LIBNAME_PKGS = ""
> >> -SRC_URI =
> >> "git://
> git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master
> <http://git.enlightenment.org/legacy/$%7BBPN%7D.git;protocol=https;branch=master>"
>
> >>
> >> +SRC_URI =
> >> "git://
> git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master
> <http://git.enlightenment.org/old/legacy-$%7BBPN%7D.git;protocol=https;branch=master>"
>
> >>
> >>   S = "${WORKDIR}/git"
> >>   PACKAGECONFIG ??= "jpeg png zlib
> >> ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
> >>
> >>
> >>
> >>
> >>
> >
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#97134):
> https://lists.openembedded.org/g/openembedded-devel/message/97134
> > Mute This Topic: https://lists.openembedded.org/mt/91008939/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [
> raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
Khem Raj May 16, 2022, 5:58 p.m. UTC | #2
On Mon, May 16, 2022 at 10:45 AM Nicolas Dechesne <
nicolas.dechesne@linaro.org> wrote:

>
>
> On Mon, May 16, 2022 at 6:09 PM Khem Raj <raj.khem@gmail.com> wrote:
>
>>
>>
>> On 5/16/22 8:28 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
>> > 2022. 05. 10. 11:28 keltezéssel, Nicolas Dechesne írta:
>> >> The upstream repo location has changed, it's now
>> >> https://git.enlightenment.org/old/legacy-imlib2
>> >
>> > This hits every branch in meta-openembedded, not only master.
>> >
>>
>> A different patch fixing same thing is already in master.
>>
>
> This is the merged patch, e.g.
> 62becef1091d (imlib2: update SRC_URI)
>
> Not sure what you meant.
>


I had the thread broken I should have said this patch is upstream in master
already if needed send backport request for respective release branches

> And yes, it's needed in all branches. Do you want/need a patch for this,
> or can you backport/apply directly?
>
>>
>> >>
>> >> It's not clear when or why it happened, but the the commit hash we use
>> >> in SRCREV exists in the 'new' location, so let's at least update the
>> >> SRC_URI for now, and fix this warning:
>> >>
>> >> WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL
>> >> git://
>> git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master,
>> >> attempting MIRRORS if available
>> >>
>> >> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
>> >> ---
>> >>   meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
>> >>   1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>> >> b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>> >> index 56d41cd39..869f8123d 100644
>> >> --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>> >> +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>> >> @@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package
>> >>   AUTO_LIBNAME_PKGS = ""
>> >> -SRC_URI =
>> >> "git://
>> git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master
>> <http://git.enlightenment.org/legacy/$%7BBPN%7D.git;protocol=https;branch=master>"
>>
>> >>
>> >> +SRC_URI =
>> >> "git://
>> git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master
>> <http://git.enlightenment.org/old/legacy-$%7BBPN%7D.git;protocol=https;branch=master>"
>>
>> >>
>> >>   S = "${WORKDIR}/git"
>> >>   PACKAGECONFIG ??= "jpeg png zlib
>> >> ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
>> >>
>> >>
>> >>
>> >>
>> >>
>> >
>> >
>> >
>> > -=-=-=-=-=-=-=-=-=-=-=-
>> > Links: You receive all messages sent to this group.
>> > View/Reply Online (#97134):
>> https://lists.openembedded.org/g/openembedded-devel/message/97134
>> > Mute This Topic: https://lists.openembedded.org/mt/91008939/1997914
>> > Group Owner: openembedded-devel+owner@lists.openembedded.org
>> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
>> [raj.khem@gmail.com]
>> > -=-=-=-=-=-=-=-=-=-=-=-
>> >
>>
>
Nicolas Dechesne May 16, 2022, 6:08 p.m. UTC | #3
On Mon, May 16, 2022 at 7:59 PM Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On Mon, May 16, 2022 at 10:45 AM Nicolas Dechesne <
> nicolas.dechesne@linaro.org> wrote:
>
>>
>>
>> On Mon, May 16, 2022 at 6:09 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>>>
>>>
>>> On 5/16/22 8:28 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
>>> > 2022. 05. 10. 11:28 keltezéssel, Nicolas Dechesne írta:
>>> >> The upstream repo location has changed, it's now
>>> >> https://git.enlightenment.org/old/legacy-imlib2
>>> >
>>> > This hits every branch in meta-openembedded, not only master.
>>> >
>>>
>>> A different patch fixing same thing is already in master.
>>>
>>
>> This is the merged patch, e.g.
>> 62becef1091d (imlib2: update SRC_URI)
>>
>> Not sure what you meant.
>>
>
>
> I had the thread broken I should have said this patch is upstream in
> master already if needed send backport request for respective release
> branches
>

ok, done for honister and kirkstone


> And yes, it's needed in all branches. Do you want/need a patch for this,
>> or can you backport/apply directly?
>>
>>>
>>> >>
>>> >> It's not clear when or why it happened, but the the commit hash we use
>>> >> in SRCREV exists in the 'new' location, so let's at least update the
>>> >> SRC_URI for now, and fix this warning:
>>> >>
>>> >> WARNING: imlib2-1.7.1-r0 do_fetch: Failed to fetch URL
>>> >> git://
>>> git.enlightenment.org/legacy/imlib2.git;protocol=https;branch=master,
>>> >> attempting MIRRORS if available
>>> >>
>>> >> Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
>>> >> ---
>>> >>   meta-oe/recipes-graphics/imlib2/imlib2_git.bb | 2 +-
>>> >>   1 file changed, 1 insertion(+), 1 deletion(-)
>>> >>
>>> >> diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>>> >> b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>>> >> index 56d41cd39..869f8123d 100644
>>> >> --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>>> >> +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
>>> >> @@ -14,7 +14,7 @@ inherit autotools pkgconfig lib_package
>>> >>   AUTO_LIBNAME_PKGS = ""
>>> >> -SRC_URI =
>>> >> "git://
>>> git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master
>>> <http://git.enlightenment.org/legacy/$%7BBPN%7D.git;protocol=https;branch=master>"
>>>
>>> >>
>>> >> +SRC_URI =
>>> >> "git://
>>> git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master
>>> <http://git.enlightenment.org/old/legacy-$%7BBPN%7D.git;protocol=https;branch=master>"
>>>
>>> >>
>>> >>   S = "${WORKDIR}/git"
>>> >>   PACKAGECONFIG ??= "jpeg png zlib
>>> >> ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
>>> >>
>>> >>
>>> >>
>>> >>
>>> >>
>>> >
>>> >
>>> >
>>> > -=-=-=-=-=-=-=-=-=-=-=-
>>> > Links: You receive all messages sent to this group.
>>> > View/Reply Online (#97134):
>>> https://lists.openembedded.org/g/openembedded-devel/message/97134
>>> > Mute This Topic: https://lists.openembedded.org/mt/91008939/1997914
>>> > Group Owner: openembedded-devel+owner@lists.openembedded.org
>>> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
>>> [raj.khem@gmail.com]
>>> > -=-=-=-=-=-=-=-=-=-=-=-
>>> >
>>>
>>

Patch

diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
index 56d41cd39..869f8123d 100644
--- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
+++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb
@@ -14,7 +14,7 @@  inherit autotools pkgconfig lib_package
 
 AUTO_LIBNAME_PKGS = ""
 
-SRC_URI = "git://git.enlightenment.org/legacy/${BPN}.git;protocol=https;branch=master"
+SRC_URI = "git://git.enlightenment.org/old/legacy-${BPN}.git;protocol=https;branch=master"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= "jpeg png zlib ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"