diff options
author | Ross Burton <ross.burton@intel.com> | 2015-09-09 13:35:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:48:35 +0100 |
commit | 48a144b4a403acb599523dc12e4033d1c5494c21 (patch) | |
tree | d4e19e45f78e04e83e5adda734afb2e947a14b99 /meta | |
parent | f7056fafd2dbd085e04a1ab54d4d8bbe83109592 (diff) | |
download | poky-48a144b4a403acb599523dc12e4033d1c5494c21.tar.gz |
sstate: only fetch remote signatures if verification is enabled
Only fetch remote signatures if verification has been enabled, as otherwise the
fetcher throws errors that sstate.bbclass can't ignore.
[ YOCTO #8265 ]
(From OE-Core rev: aa8ba5c4af2636dbc2d0c1ad9c230e8aa26d9962)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sstate.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 77313bcfbc..50729bf750 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -615,9 +615,12 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): | |||
615 | 615 | ||
616 | # Try a fetch from the sstate mirror, if it fails just return and | 616 | # Try a fetch from the sstate mirror, if it fails just return and |
617 | # we will build the package | 617 | # we will build the package |
618 | for srcuri in ['file://{0}'.format(sstatefetch), | 618 | uris = ['file://{0}'.format(sstatefetch), |
619 | 'file://{0}.siginfo'.format(sstatefetch), | 619 | 'file://{0}.siginfo'.format(sstatefetch)] |
620 | 'file://{0}.sig'.format(sstatefetch)]: | 620 | if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False): |
621 | uris += ['file://{0}.sig'.format(sstatefetch)] | ||
622 | |||
623 | for srcuri in uris: | ||
621 | localdata.setVar('SRC_URI', srcuri) | 624 | localdata.setVar('SRC_URI', srcuri) |
622 | try: | 625 | try: |
623 | fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) | 626 | fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) |