1
0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00

populate_sdk_ext: Do not assume local.conf will always exist

Some distros may not have local.conf, and use auto.conf or site.conf
alone to describe distro config metadata, therefore make code robust
to not fail eSDK builds for such setups

(From OE-Core rev: 554dba802108c91b79acf81c046e6a47815404fb)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6379f951ba92b2b86a55de5fc267bacf8c6095d2)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2020-09-13 00:44:00 -07:00
committed by Richard Purdie
parent a509a6301e
commit 2f63316394
+3 -2
View File
@@ -310,8 +310,9 @@ python copy_buildsystem () {
if os.path.exists(builddir + '/conf/auto.conf'):
with open(builddir + '/conf/auto.conf', 'r') as f:
oldlines += f.readlines()
with open(builddir + '/conf/local.conf', 'r') as f:
oldlines += f.readlines()
if os.path.exists(builddir + '/conf/local.conf'):
with open(builddir + '/conf/local.conf', 'r') as f:
oldlines += f.readlines()
(updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
with open(baseoutpath + '/conf/local.conf', 'w') as f: