From: Khem Raj Date: Sun, 13 Sep 2020 07:44:00 +0000 (-0700) Subject: populate_sdk_ext: Do not assume local.conf will always exist X-Git-Tag: 2020-04.3-dunfell~4 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=554dba802108c91b79acf81c046e6a47815404fb;p=openembedded-core.git 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 Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 6379f951ba92b2b86a55de5fc267bacf8c6095d2) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index fd0da16e7e..71686bc993 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -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: