diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-11-11 00:18:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-11 17:09:17 +0000 |
commit | 3fcaef51efbedee2c1eafbed5a0417741be5825b (patch) | |
tree | 2d5d14df8489ebbbdafcb7834f93a1ea2ea3679d /meta/lib/oeqa/sdkext | |
parent | 813499ed5faf8a05584ea2efc848bb2dfba4aace (diff) | |
download | poky-3fcaef51efbedee2c1eafbed5a0417741be5825b.tar.gz |
testsdk.py: Clean up the additions to PREMIRRORS and SSTATE_MIRRORS
Since commit 044fb04d in bitbake (fetch2: Allow whitespace only mirror
entries) there is no need to separate the entries in PREMIRRORS and
SSTATE_MIRRORS with "\n".
(From OE-Core rev: 3db607deea3b2982edb333f99056119490fcf5ea)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/sdkext')
-rw-r--r-- | meta/lib/oeqa/sdkext/testsdk.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py index 6b564fa455..159f0d135b 100644 --- a/meta/lib/oeqa/sdkext/testsdk.py +++ b/meta/lib/oeqa/sdkext/testsdk.py | |||
@@ -67,10 +67,10 @@ class TestSDKExt(TestSDKBase): | |||
67 | # and we don't spend hours downloading kernels for the kernel module test | 67 | # and we don't spend hours downloading kernels for the kernel module test |
68 | # Abuse auto.conf since local.conf would be overwritten by the SDK | 68 | # Abuse auto.conf since local.conf would be overwritten by the SDK |
69 | with open(os.path.join(sdk_dir, 'conf', 'auto.conf'), 'a+') as f: | 69 | with open(os.path.join(sdk_dir, 'conf', 'auto.conf'), 'a+') as f: |
70 | f.write('SSTATE_MIRRORS += " \\n file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) | 70 | f.write('SSTATE_MIRRORS += "file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) |
71 | f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) | 71 | f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) |
72 | f.write('INHERIT += "own-mirrors"\n') | 72 | f.write('INHERIT += "own-mirrors"\n') |
73 | f.write('PREMIRRORS:prepend = " git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME \\n "\n' % test_data.get('DL_DIR')) | 73 | f.write('PREMIRRORS:prepend = "git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME "\n' % test_data.get('DL_DIR')) |
74 | 74 | ||
75 | # We need to do this in case we have a minimal SDK | 75 | # We need to do this in case we have a minimal SDK |
76 | subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ | 76 | subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ |