From 3db607deea3b2982edb333f99056119490fcf5ea Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 11 Nov 2021 00:18:56 +0100 Subject: [PATCH] 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". Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdkext/testsdk.py | 4 ++-- 1 file 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): # and we don't spend hours downloading kernels for the kernel module test # 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('SSTATE_MIRRORS += "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"\n') - f.write('PREMIRRORS:prepend = " git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME \\n "\n' % test_data.get('DL_DIR')) + f.write('PREMIRRORS:prepend = "git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME "\n' % test_data.get('DL_DIR')) # We need to do this in case we have a minimal SDK subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ -- 2.40.1