If the build-st/conf/local.conf does not end with a newline when is generated then add one Fixes [YOCTO #15734]
CC: Yoann Congal <yoann.con...@smile.fr> CC: Randy MacLeod <randy.macl...@windriver.com> CC: Alexander Kanavin <alex.kana...@gmail.com> Signed-off-by: Christos Gavros <gavr...@yahoo.com> --- v2->v3 * reading the file line by line replaced with f.readlines (it uses more memory but gives faster access) --- meta/lib/oeqa/selftest/context.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 5eb4cc44fd..16f82c6737 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -102,6 +102,13 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") oe.path.copytree(selftestdir, newselftestdir) + # if the last line of local.conf in newbuilddir is not empty and does not end with newline then add one + localconf_path = newbuilddir + "/conf/local.conf" + with open(localconf_path, "r+", encoding="utf-8") as f: + last_line = f.readlines()[-1] + if last_line and not last_line.endswith("\n"): + f.write("\n") + subprocess.check_output("git init && git add * && git commit -a -m 'initial'", cwd=newselftestdir, shell=True) # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#211919): https://lists.openembedded.org/g/openembedded-core/message/211919 Mute This Topic: https://lists.openembedded.org/mt/111381716/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-