diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-13 07:47:44 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 11:54:51 +0000 |
commit | 91877aa60e82456a0dfba3c471ef6af8ce9cc278 (patch) | |
tree | 5bb97429bfe567b349d072c8ba41f25fe17d5473 /meta | |
parent | 764c9279eaebe2774ec344f722dfec9911b45691 (diff) | |
download | poky-91877aa60e82456a0dfba3c471ef6af8ce9cc278.tar.gz |
classes/populate_sdk_ext.bbclass: handle if local.conf doesn't end with a newline
If there is no newline at the end of local.conf, appending
INHERIT = "uninative" won't work, it will corrupt the line and the
installed eSDK will build things, making the "Preparing build system..."
step take an age.
Fixes [YOCTO #8897].
(From OE-Core rev: 1e641f09e8cf0ba716c3d2aade0845abecc27827)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 87fb7671fd..984f5389f9 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -142,6 +142,8 @@ python copy_buildsystem () { | |||
142 | for line in newlines: | 142 | for line in newlines: |
143 | if line.strip() and not line.startswith('#'): | 143 | if line.strip() and not line.startswith('#'): |
144 | f.write(line) | 144 | f.write(line) |
145 | # Write a newline just in case there's none at the end of the original | ||
146 | f.write('\n') | ||
145 | 147 | ||
146 | f.write('INHERIT += "%s"\n\n' % 'uninative') | 148 | f.write('INHERIT += "%s"\n\n' % 'uninative') |
147 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) | 149 | f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False)) |