From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/4] classes/populate_sdk_ext: support auto.conf
Date: Wed, 13 Jan 2016 07:47:45 +1300 [thread overview]
Message-ID: <0fa14d75f9861a513bddc8091546117642d49218.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 auto.conf exists in the user's configuration we need to also run it
through the same filter and write the result into the ext SDK, or we
risk missing configuration applied on an autobuilder.
Fixes [YOCTO #8904].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/classes/populate_sdk_ext.bbclass | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 984f538..69e13ab 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -169,6 +169,19 @@ python copy_buildsystem () {
f.write('require conf/locked-sigs.inc\n')
+ if os.path.exists(builddir + '/conf/auto.conf'):
+ with open(builddir + '/conf/auto.conf', 'r') as f:
+ oldlines = f.readlines()
+ (updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
+ with open(baseoutpath + '/conf/auto.conf', 'w') as f:
+ f.write('# WARNING: this configuration has been automatically generated and in\n')
+ f.write('# most cases should not be edited. If you need more flexibility than\n')
+ f.write('# this configuration provides, it is strongly suggested that you set\n')
+ f.write('# up a proper instance of the full build system and use that instead.\n\n')
+ for line in newlines:
+ if line.strip() and not line.startswith('#'):
+ f.write(line)
+
sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc'
oe.copy_buildsystem.generate_locked_sigs(sigfile, d)
--
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 ` [PATCH 1/4] classes/populate_sdk_ext.bbclass: handle if local.conf doesn't end with a newline Paul Eggleton
2016-01-12 18:47 ` Paul Eggleton [this message]
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=0fa14d75f9861a513bddc8091546117642d49218.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