diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-09-22 17:21:18 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-22 18:12:51 +0100 |
| commit | 84a1f82acd3b6ebb3c073aae6b996d2203dad2ce (patch) | |
| tree | 383032002ad210b7b68be5a5b3820fde47c90fc8 | |
| parent | ef7001232ac2da8ee63ec568d1abba13e4fd4382 (diff) | |
| download | openembedded-core-contrib-84a1f82acd3b6ebb3c073aae6b996d2203dad2ce.tar.gz | |
classes/populate_sdk_ext: drop work-config.inc
This is not actually used for anything - I thought that we would need to
use it within devtool to set global configuration, but we're able to do
everything we need within the bbappends it creates, which also saves on
parse time. If we're not going to use work-config.inc let's just drop it
completely.
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 | 5 | ||||
| -rw-r--r-- | scripts/lib/devtool/sdk.py | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 947ec741ac..c244d9356b 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -165,7 +165,6 @@ python copy_buildsystem () { f.write(line.strip() + '\n') f.write('require conf/locked-sigs.inc\n') - f.write('require conf/work-config.inc\n') sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc' oe.copy_buildsystem.generate_locked_sigs(sigfile, d) @@ -185,10 +184,6 @@ python copy_buildsystem () { d.getVar('SSTATE_DIR', True), sstate_out, d, fixedlsbstring) - - # Create a dummy config file for additional settings - with open(baseoutpath + '/conf/work-config.inc', 'w') as f: - pass } def extsdk_get_buildtools_filename(d): diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index 2f416b36f5..7a842afc24 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py @@ -170,7 +170,7 @@ def sdk_update(args, config, basepath, workspace): logger.error("Updating meta data via git failed") return ret logger.debug("Updating conf files ...") - conf_files = ['local.conf', 'bblayers.conf', 'devtool.conf', 'work-config.inc', 'locked-sigs.inc'] + conf_files = ['local.conf', 'bblayers.conf', 'devtool.conf', 'locked-sigs.inc'] for conf in conf_files: ret = subprocess.call("wget -q -O - %s/conf/%s > conf/%s" % (args.updateserver, conf, conf), shell=True) if ret != 0: |