[oe-commits] [openembedded-core] branch master updated: testsdk: Use auto.conf instead of local.conf to set SSTATE_MIRROR

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

The following commit(s) were added to refs/heads/master by this push:
     new 444a71b  testsdk: Use auto.conf instead of local.conf to set SSTATE_MIRROR
444a71b is described below

commit 444a71b1c2d8f86fc4c35c8ff8e92bcbbe646b75
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Mar 2 15:24:45 2017 +0000

    testsdk: Use auto.conf instead of local.conf to set SSTATE_MIRROR
    
    The local.conf file can get overritten and changed by the SDK so (ab)use
    auto.conf instead to ensure our configuration tweaks get applied.
    
    Also ensure we append to any other configured SSTATE_MIRROR variable
    that already exists.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/testsdk.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index 0e6949e..d566b43 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -154,8 +154,9 @@ def testsdkext_main(d):
 
         # Use our own SSTATE_DIR and DL_DIR so that updates to the eSDK come from our sstate cache
         # and we don't spend hours downloading kernels for the kernel module test
-        with open(os.path.join(sdk_dir, 'conf', 'local.conf'), 'a+') as f:
-            f.write('SSTATE_MIRRORS = "file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR'))
+        # Abuse auto.conf since local.conf would be overwritten by the SDK
+        with open(os.path.join(sdk_dir, 'conf', 'auto.conf'), 'a+') as f:
+            f.write('SSTATE_MIRRORS += " \\n file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR'))
             f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR'))
             f.write('INHERIT += "own-mirrors"')
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.