summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2015-12-10 23:57:23 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-08 12:10:32 +0000
commit8a3deca4a4dae430e5434c2f082a4b46bfd5188a (patch)
treeb596eb971679172aa02ba90236f41eb36034db16 /bitbake
parent0073b234d793099a371b2e529f740987decce756 (diff)
downloadpoky-8a3deca4a4dae430e5434c2f082a4b46bfd5188a.tar.gz
bitbake: fetch: use orig localpath when calling orig method
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. (Bitbake rev: 022fe4481dc80121abb04e8a2b357722bc806475) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index 288a1c8fd0..a9c044b6a5 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -955,7 +955,7 @@ def try_mirror_url(fetch, origud, ud, ld, check = False):
955 origud.method.download(origud, ld) 955 origud.method.download(origud, ld)
956 if hasattr(origud.method,"build_mirror_data"): 956 if hasattr(origud.method,"build_mirror_data"):
957 origud.method.build_mirror_data(origud, ld) 957 origud.method.build_mirror_data(origud, ld)
958 return ud.localpath 958 return origud.localpath
959 # Otherwise the result is a local file:// and we symlink to it 959 # Otherwise the result is a local file:// and we symlink to it
960 if not os.path.exists(origud.localpath): 960 if not os.path.exists(origud.localpath):
961 if os.path.islink(origud.localpath): 961 if os.path.islink(origud.localpath):