summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-01-13 07:47:45 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:54:51 +0000
commit39f6472605fb40c01e0bbfe52702a1b3beb55690 (patch)
tree7240e666bee1e3854316f464922a5879170627ca /meta/classes
parent91877aa60e82456a0dfba3c471ef6af8ce9cc278 (diff)
downloadpoky-39f6472605fb40c01e0bbfe52702a1b3beb55690.tar.gz
classes/populate_sdk_ext: support auto.conf
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]. (From OE-Core rev: fb0a34a00f3eb10935a3fca4d0af74ae4de4f9a5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass13
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 984f5389f9..69e13abc73 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -169,6 +169,19 @@ python copy_buildsystem () {
169 169
170 f.write('require conf/locked-sigs.inc\n') 170 f.write('require conf/locked-sigs.inc\n')
171 171
172 if os.path.exists(builddir + '/conf/auto.conf'):
173 with open(builddir + '/conf/auto.conf', 'r') as f:
174 oldlines = f.readlines()
175 (updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var)
176 with open(baseoutpath + '/conf/auto.conf', 'w') as f:
177 f.write('# WARNING: this configuration has been automatically generated and in\n')
178 f.write('# most cases should not be edited. If you need more flexibility than\n')
179 f.write('# this configuration provides, it is strongly suggested that you set\n')
180 f.write('# up a proper instance of the full build system and use that instead.\n\n')
181 for line in newlines:
182 if line.strip() and not line.startswith('#'):
183 f.write(line)
184
172 sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc' 185 sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc'
173 oe.copy_buildsystem.generate_locked_sigs(sigfile, d) 186 oe.copy_buildsystem.generate_locked_sigs(sigfile, d)
174 187