diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-09-13 00:44:00 -0700 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-09-14 04:49:12 -1000 |
| commit | 554dba802108c91b79acf81c046e6a47815404fb (patch) | |
| tree | cdfd4f7afed50d65ff924b9285fcc05f1fb59692 | |
| parent | c8ad554db100b9fd16097fc8616b2af5390772e7 (diff) | |
| download | openembedded-core-contrib-554dba802108c91b79acf81c046e6a47815404fb.tar.gz | |
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 <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>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
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: |