[PATCH] bitbake: fetch: use orig localpath when calling orig method

[PATCH] bitbake: fetch: use orig localpath when calling orig method

[Awais Belal]

From: Christopher Larson <chris_larson@mentor.com>

When a mirror tarball is fetched, the original fetch method is called, which
unpacks the mirror tarball. After the original method is called, it checks the
localpath of the mirror tarball rather than the clone path, which isn't ideal,
particularly if the mirror tarball was removed due to being out of date. We
know the original fetch method will do what it needs to do to get its content
in the form it needs from the mirror tarball, so we can use its localpath
instead.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
 lib/bb/fetch2/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index d66a212..68ebf8b 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -955,7 +955,7 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
                 origud.method.download(origud, ld)
                 if hasattr(origud.method,"build_mirror_data"):
                     origud.method.build_mirror_data(origud, ld)
-            return ud.localpath
+            return origud.localpath
         # Otherwise the result is a local file:// and we symlink to it
         if not os.path.exists(origud.localpath):
             if os.path.islink(origud.localpath):
-- 
1.9.1

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Belal, Awais]

This applies to 1.28 as well and otherwise broken builds are seen where the git tarball from source mirror is outdated.

BR,
Awais

________________________________________
From: bitbake-devel-bounces@lists.openembedded.org [bitbake-devel-bounces@lists.openembedded.org] on behalf of Belal, Awais
Sent: Thursday, December 10, 2015 11:57 PM
To: bitbake-devel@lists.openembedded.org
Subject: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when        calling orig method

From: Christopher Larson <chris_larson@mentor.com>

When a mirror tarball is fetched, the original fetch method is called, which
unpacks the mirror tarball. After the original method is called, it checks the
localpath of the mirror tarball rather than the clone path, which isn't ideal,
particularly if the mirror tarball was removed due to being out of date. We
know the original fetch method will do what it needs to do to get its content
in the form it needs from the mirror tarball, so we can use its localpath
instead.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
 lib/bb/fetch2/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index d66a212..68ebf8b 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -955,7 +955,7 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
                 origud.method.download(origud, ld)
                 if hasattr(origud.method,"build_mirror_data"):
                     origud.method.build_mirror_data(origud, ld)
-            return ud.localpath
+            return origud.localpath
         # Otherwise the result is a local file:// and we symlink to it
         if not os.path.exists(origud.localpath):
             if os.path.islink(origud.localpath):
--
1.9.1

--
_______________________________________________
bitbake-devel mailing list
bitbake-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 530 bytes --]

On Fri, Dec 11, 2015 at 3:56 AM, Belal, Awais <Awais_Belal@mentor.com>
wrote:

> This applies to 1.28 as well and otherwise broken builds are seen where
> the git tarball from source mirror is outdated.


As Awais says, without this applied, if you have an out of date git mirror
tarball, you'll get a do_fetch failure, so I think we really need this
merged.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 895 bytes --]

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Belal, Awais]

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

Ping! Is there a reservation against this?

BR,
Awais
________________________________
From: kergoth@gmail.com [kergoth@gmail.com] on behalf of Christopher Larson [clarson@kergoth.com]
Sent: Wednesday, December 16, 2015 8:54 AM
To: Belal, Awais
Cc: bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method


On Fri, Dec 11, 2015 at 3:56 AM, Belal, Awais <Awais_Belal@mentor.com<mailto:Awais_Belal@mentor.com>> wrote:
This applies to 1.28 as well and otherwise broken builds are seen where the git tarball from source mirror is outdated.

As Awais says, without this applied, if you have an out of date git mirror tarball, you'll get a do_fetch failure, so I think we really need this merged.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 2224 bytes --]

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Richard Purdie]

On Thu, 2015-12-17 at 13:02 +0000, Belal, Awais wrote:
> Ping! Is there a reservation against this?

No reservation, it just came in at the end of the last round of patches
I batched/tested/merged and is therefore going into the next one.

Cheers,

Richard

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Belal, Awais]

Hi Richard,

This applies to 1.28 as well as I stated earlier but I see that it only got its way into master. Is someone else maintaining 1.28 or is this just queued for later?

BR,
Awais

________________________________________
From: Richard Purdie [richard.purdie@linuxfoundation.org]
Sent: Thursday, December 17, 2015 8:05 PM
To: Belal, Awais; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

On Thu, 2015-12-17 at 13:02 +0000, Belal, Awais wrote:
> Ping! Is there a reservation against this?

No reservation, it just came in at the end of the last round of patches
I batched/tested/merged and is therefore going into the next one.

Cheers,

Richard

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Belal, Awais]

Ping!

BR,
Awais

________________________________________
From: bitbake-devel-bounces@lists.openembedded.org [bitbake-devel-bounces@lists.openembedded.org] on behalf of Belal, Awais
Sent: Tuesday, December 22, 2015 12:20 PM
To: Richard Purdie; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

Hi Richard,

This applies to 1.28 as well as I stated earlier but I see that it only got its way into master. Is someone else maintaining 1.28 or is this just queued for later?

BR,
Awais

________________________________________
From: Richard Purdie [richard.purdie@linuxfoundation.org]
Sent: Thursday, December 17, 2015 8:05 PM
To: Belal, Awais; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

On Thu, 2015-12-17 at 13:02 +0000, Belal, Awais wrote:
> Ping! Is there a reservation against this?

No reservation, it just came in at the end of the last round of patches
I batched/tested/merged and is therefore going into the next one.

Cheers,

Richard
--
_______________________________________________
bitbake-devel mailing list
bitbake-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Belal, Awais]

Ping2!

BR,
Awais

________________________________________
From: bitbake-devel-bounces@lists.openembedded.org [bitbake-devel-bounces@lists.openembedded.org] on behalf of Belal, Awais
Sent: Wednesday, January 06, 2016 2:40 PM
To: Richard Purdie; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

Ping!

BR,
Awais

________________________________________
From: bitbake-devel-bounces@lists.openembedded.org [bitbake-devel-bounces@lists.openembedded.org] on behalf of Belal, Awais
Sent: Tuesday, December 22, 2015 12:20 PM
To: Richard Purdie; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

Hi Richard,

This applies to 1.28 as well as I stated earlier but I see that it only got its way into master. Is someone else maintaining 1.28 or is this just queued for later?

BR,
Awais

________________________________________
From: Richard Purdie [richard.purdie@linuxfoundation.org]
Sent: Thursday, December 17, 2015 8:05 PM
To: Belal, Awais; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

On Thu, 2015-12-17 at 13:02 +0000, Belal, Awais wrote:
> Ping! Is there a reservation against this?

No reservation, it just came in at the end of the last round of patches
I batched/tested/merged and is therefore going into the next one.

Cheers,

Richard
--
_______________________________________________
bitbake-devel mailing list
bitbake-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel
--
_______________________________________________
bitbake-devel mailing list
bitbake-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Richard Purdie]

On Fri, 2016-01-08 at 12:02 +0000, Belal, Awais wrote:
> Ping2!

Backported, sorry about the delay.

Cheers,

Richard

Re: [PATCH] bitbake: fetch: use orig localpath when calling orig method

[Belal, Awais]

Thanks a lot Richard :)

BR,
Awais

________________________________________
From: Richard Purdie [richard.purdie@linuxfoundation.org]
Sent: Friday, January 08, 2016 5:10 PM
To: Belal, Awais; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH] bitbake: fetch: use orig localpath when calling orig method

On Fri, 2016-01-08 at 12:02 +0000, Belal, Awais wrote:
> Ping2!

Backported, sorry about the delay.

Cheers,

Richard