bitbake: bitbake: fetch2: Fix handling of SCM mirrors in MIRRORS
If an SCM mirror is in PREMIRRORS, the tarball is downloaded and then found by the "upstream" check and handled correctly. If an SCM mirror is in MIRRORS, the tarball is downloaded but not used since there is no "upstream" run after MIRRORS completes. It therefore sits there useless and unused. This code change forces the upstream to run after a mirror tarball is found and fixes the usage of SCM mirrors in MIRRORS. (Bitbake master rev: a66ee0994645aa5658b2f5ea134ed17d89f8751a) (Bitbake rev: 98d2cd8576a8d035e2b073cd54bb737a3c22bc4d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c53d0d4786
commit
53ce38bd0f
|
@ -805,6 +805,10 @@ def try_mirror_url(newuri, origud, ud, ld, check = False):
|
||||||
dest = os.path.join(dldir, os.path.basename(ud.localpath))
|
dest = os.path.join(dldir, os.path.basename(ud.localpath))
|
||||||
if not os.path.exists(dest):
|
if not os.path.exists(dest):
|
||||||
os.symlink(ud.localpath, dest)
|
os.symlink(ud.localpath, dest)
|
||||||
|
if not os.path.exists(origud.donestamp) or origud.method.need_update(origud.url, origud, ld):
|
||||||
|
origud.method.download(origud.url, origud, ld)
|
||||||
|
if hasattr(ud.method,"build_mirror_data"):
|
||||||
|
origud.method.build_mirror_data(origud.url, origud, ld)
|
||||||
return None
|
return None
|
||||||
# Otherwise the result is a local file:// and we symlink to it
|
# Otherwise the result is a local file:// and we symlink to it
|
||||||
if not os.path.exists(origud.localpath):
|
if not os.path.exists(origud.localpath):
|
||||||
|
|
Loading…
Reference in New Issue