From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/4] classes/populate_sdk_ext.bbclass: handle if local.conf doesn't end with a newline
Date: Wed, 13 Jan 2016 07:47:44 +1300 [thread overview]
Message-ID: <5b7e2d609c3d9d212225d30cf252ccb4e534b54e.1452624350.git.paul.eggleton@linux.intel.com> (raw)
In-Reply-To: <cover.1452624350.git.paul.eggleton@linux.intel.com>
In-Reply-To: <cover.1452624350.git.paul.eggleton@linux.intel.com>
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>
---
meta/classes/populate_sdk_ext.bbclass | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 87fb767..984f538 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))
--
2.5.0
next prev parent reply other threads:[~2016-01-12 18:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 18:47 [PATCH 0/4] Extensible SDK fixes Paul Eggleton
2016-01-12 18:47 ` Paul Eggleton [this message]
2016-01-12 18:47 ` [PATCH 2/4] classes/populate_sdk_ext: support auto.conf Paul Eggleton
2016-01-12 18:47 ` [PATCH 3/4] classes/buildhistory: save auto.conf and bblayers.conf for extensible SDK Paul Eggleton
2016-01-12 18:47 ` [PATCH 4/4] classes/populate_sdk_ext: check that extensible SDK prepared correctly Paul Eggleton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5b7e2d609c3d9d212225d30cf252ccb4e534b54e.1452624350.git.paul.eggleton@linux.intel.com \
--to=paul.eggleton@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox