Skip to contentSkip to conversation

populate_sdk_ext: Do not assume local.conf will always exist

PATCH New Khem Raj 1 participant 1 message Sep 13, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 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

---
 meta/classes/populate_sdk_ext.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/classes/populate_sdk_ext.bbclass +3 -2
index 44d99cfb97..d659b6940a 100644
@@ -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:
Signature · 1 line
2.28.0