[oe-commits] Joe MacDonald : sstate.bbclass: Add an extra check for sstate_mirrors

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: ed585cad2e1fdc323c05fa82055a071bcf98d1bc
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ed585cad2e1fdc323c05fa82055a071bcf98d1bc

Author: Joe MacDonald <joe at deserted.net>
Date:   Tue Jul  2 09:19:07 2013 -0400

sstate.bbclass: Add an extra check for sstate_mirrors

BB_NO_NETWORK disables any fetching, however if we're using an external
sstate cache, we may want to be able to fetch those objects even if we are
not fetching the upstream sources.  Denote this situation by setting
SSTATE_MIRROR_ALLOW_NETWORK in local.conf.  When it is found, for sstate
cache fetches, mask off BB_NO_NETWORK for the local function.

Signed-off-by: Joe MacDonald <joe.macdonald at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/sstate.bbclass |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 28dc312..c1ca54b 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -509,6 +509,11 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
     localdata.setVar('DL_DIR', dldir)
     localdata.setVar('PREMIRRORS', mirrors)
 
+    # if BB_NO_NETWORK is set but we also have SSTATE_MIRROR_ALLOW_NETWORK,
+    # we'll want to allow network access for the current set of fetches.
+    if localdata.getVar('BB_NO_NETWORK', True) == "1" and localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK', True) == "1":
+        localdata.delVar('BB_NO_NETWORK')
+
     # Try a fetch from the sstate mirror, if it fails just return and
     # we will build the package
     for srcuri in ['file://{0}'.format(sstatefetch),
@@ -619,6 +624,11 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
 
         bb.debug(2, "SState using premirror of: %s" % mirrors)
 
+        # if BB_NO_NETWORK is set but we also have SSTATE_MIRROR_ALLOW_NETWORK,
+        # we'll want to allow network access for the current set of fetches.
+        if localdata.getVar('BB_NO_NETWORK', True) == "1" and localdata.getVar('SSTATE_MIRROR_ALLOW_NETWORK', True) == "1":
+            localdata.delVar('BB_NO_NETWORK')
+
         for task in range(len(sq_fn)):
             if task in ret:
                 continue