summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-13 07:47:44 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-13 00:08:25 +0000
commit1e641f09e8cf0ba716c3d2aade0845abecc27827 (patch)
tree2bafa9a0256227a4f15bfb489872bee9801fa3e5 /meta
parent9ba9807fc7c19938022c37641b171464699fc742 (diff)
downloadopenembedded-core-1e641f09e8cf0ba716c3d2aade0845abecc27827.tar.gz
openembedded-core-1e641f09e8cf0ba716c3d2aade0845abecc27827.tar.bz2
openembedded-core-1e641f09e8cf0ba716c3d2aade0845abecc27827.zip
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]. 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.bbclass2
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 () {
for line in newlines:
if line.strip() and not line.startswith('#'):
f.write(line)
+ # Write a newline just in case there's none at the end of the original
+ f.write('\n')
f.write('INHERIT += "%s"\n\n' % 'uninative')
f.write('CONF_VERSION = "%s"\n\n' % d.getVar('CONF_VERSION', False))