classes/sstate.bbclass: checkhashes modify to take into account siginfo.

PATCH New Aníbal Limón 1 participant 1 message Nov 24, 2015

Share & tools

Aníbal Limón

author

2015-11-24 21:54 UTC #0 lore raw

PATCH 1/1 classes/sstate.bbclass: checkhashes modify to take into account siginfo.

When sstate file exists but not siginfo one then sstate need to be marked as
non-available to avoid post FetchError's when trying to download siginfo.

For example,

WARNING: Failed to fetch URL file://3b/sstate:gcc::5.2.0:r0::3:3bb8ffd234f7eb3709b5447f1f82d6d0_populate_lic.tgz.siginfo, attempting MIRRORS if available

ERROR: Fetcher failure: Unable to find file file://3b/sstate:gcc::5.2.0:r0::3:3bb8ffd234f7eb3709b5447f1f82d6d0_populate_lic.tgz.siginfo anywhere. The paths that were searched were:
/home/alimon/repos/poky/build-x86/sstate-cache /home/alimon/repos/poky/build-x86/sstate-cache

Signed-off-by Aníbal Limón <[email protected]>

---
 meta/classes/sstate.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

meta/classes/sstate.bbclass +5 -2

index d09e27a..b41860b 100644
@@ -763,12 +763,15 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=False):
             (task, sstatefile) = arg
 
             localdata2 = bb.data.createCopy(localdata)
-            srcuri = "file://" + sstatefile
+            uris = ['file://{0}'.format(sstatefile),
+                    'file://{0}.siginfo'.format(sstatefile)]
+            srcuri = '\t'.join(uris)
+
             localdata.setVar('SRC_URI', srcuri)
             bb.debug(2, "SState: Attempting to fetch %s" % srcuri)
 
             try:
-                fetcher = bb.fetch2.Fetch(srcuri.split(), localdata2,
+                fetcher = bb.fetch2.Fetch(uris, localdata2,
                             connection_cache=thread_worker.connection_cache)
                 fetcher.checkstatus()
                 bb.debug(2, "SState: Successful fetch test for %s" % srcuri)

Signature · 1 line

2.1.4