diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sstate.bbclass | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 22ce1ee9ef..6bf94b0ec7 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -623,10 +623,10 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): | |||
623 | 623 | ||
624 | # Try a fetch from the sstate mirror, if it fails just return and | 624 | # Try a fetch from the sstate mirror, if it fails just return and |
625 | # we will build the package | 625 | # we will build the package |
626 | uris = ['file://{0}'.format(sstatefetch), | 626 | uris = ['file://{0};downloadfilename={0}'.format(sstatefetch), |
627 | 'file://{0}.siginfo'.format(sstatefetch)] | 627 | 'file://{0}.siginfo;downloadfilename={0}.siginfo'.format(sstatefetch)] |
628 | if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False): | 628 | if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False): |
629 | uris += ['file://{0}.sig'.format(sstatefetch)] | 629 | uris += ['file://{0}.sig;downloadfilename={0}.sig'.format(sstatefetch)] |
630 | 630 | ||
631 | for srcuri in uris: | 631 | for srcuri in uris: |
632 | localdata.setVar('SRC_URI', srcuri) | 632 | localdata.setVar('SRC_URI', srcuri) |
@@ -634,12 +634,6 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): | |||
634 | fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) | 634 | fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) |
635 | fetcher.download() | 635 | fetcher.download() |
636 | 636 | ||
637 | # Need to optimise this, if using file:// urls, the fetcher just changes the local path | ||
638 | # For now work around by symlinking | ||
639 | localpath = bb.data.expand(fetcher.localpath(srcuri), localdata) | ||
640 | if localpath != sstatepkg and os.path.exists(localpath) and not os.path.exists(sstatepkg): | ||
641 | os.symlink(localpath, sstatepkg) | ||
642 | |||
643 | except bb.fetch2.BBFetchException: | 637 | except bb.fetch2.BBFetchException: |
644 | break | 638 | break |
645 | 639 | ||