[gnome-continuous-yocto/gnomeostree-3.28-rocko: 491/8267] sstate.bbclass: Don't create symlinks, download to the correct location

[Emmanuele Bassi <ebassi src gnome org>]

commit 1cdd9795dd71d212e01fc5a757e6c9d2b5a08770
Author: Randy Witt <randy e witt linux intel com>
Date:   Mon May 23 14:57:00 2016 -0700

    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>

 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 22ce1ee..6bf94b0 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -623,10 +623,10 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
 
     # Try a fetch from the sstate mirror, if it fails just return and
     # we will build the package
-    uris = ['file://{0}'.format(sstatefetch),
-            'file://{0}.siginfo'.format(sstatefetch)]
+    uris = ['file://{0};downloadfilename={0}'.format(sstatefetch),
+            'file://{0}.siginfo;downloadfilename={0}.siginfo'.format(sstatefetch)]
     if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False):
-        uris += ['file://{0}.sig'.format(sstatefetch)]
+        uris += ['file://{0}.sig;downloadfilename={0}.sig'.format(sstatefetch)]
 
     for srcuri in uris:
         localdata.setVar('SRC_URI', srcuri)
@@ -634,12 +634,6 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
             fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False)
             fetcher.download()
 
-            # Need to optimise this, if using file:// urls, the fetcher just changes the local path
-            # For now work around by symlinking
-            localpath = bb.data.expand(fetcher.localpath(srcuri), localdata)
-            if localpath != sstatepkg and os.path.exists(localpath) and not os.path.exists(sstatepkg):
-                os.symlink(localpath, sstatepkg)
-
         except bb.fetch2.BBFetchException:
             break