summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2016-05-23 14:57:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-25 07:50:17 +0100
commit1cdd9795dd71d212e01fc5a757e6c9d2b5a08770 (patch)
tree08ac2e8ed60a2296a66682d117d23f4f84decee8
parent2d0a5c8361c9167f468c76ac41163d407a242599 (diff)
downloadpoky-1cdd9795dd71d212e01fc5a757e6c9d2b5a08770.tar.gz
sstate.bbclass: Don't create symlinks, download to the correct location
Previously the sstate was all downloaded to the same directory and then symlinks were added in the directories that pointed to the siginfo and sstate in the parent directory. This change makes it so that now the files are just downloaded to the correct location without the need for symlinks. (From OE-Core rev: 55d25ed6b30ed7105d3b6421fbf2a03cea009a59) Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass12
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