diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-13 07:47:45 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-13 00:08:25 +0000 |
| commit | fb0a34a00f3eb10935a3fca4d0af74ae4de4f9a5 (patch) | |
| tree | 5d94c169f9c29994da16f808b5425a4e8947fedb | |
| parent | 1e641f09e8cf0ba716c3d2aade0845abecc27827 (diff) | |
| download | openembedded-core-fb0a34a00f3eb10935a3fca4d0af74ae4de4f9a5.tar.gz openembedded-core-fb0a34a00f3eb10935a3fca4d0af74ae4de4f9a5.tar.bz2 openembedded-core-fb0a34a00f3eb10935a3fca4d0af74ae4de4f9a5.zip | |
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].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 13 |
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 () { 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) |