]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
testsdk: Use auto.conf instead of local.conf to set SSTATE_MIRROR
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Mar 2017 15:24:45 +0000 (15:24 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Mar 2017 16:09:24 +0000 (16:09 +0000)
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@linuxfoundation.org>
meta/classes/testsdk.bbclass

index 0e6949ed9ff2851eaca4e6262d86473a9423a5e5..d566b43ba0ea2f2832cb295ed3d44cc75312d721 100644 (file)
@@ -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"')