From: Paul Eggleton Date: Tue, 12 Jan 2016 18:47:44 +0000 (+1300) Subject: classes/populate_sdk_ext.bbclass: handle if local.conf doesn't end with a newline X-Git-Tag: 2016-4~1601 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1e641f09e8cf0ba716c3d2aade0845abecc27827;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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))