diff options
-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 () { | |||
165 | f.write(line.strip() + '\n') | 165 | f.write(line.strip() + '\n') |
166 | 166 | ||
167 | f.write('require conf/locked-sigs.inc\n') | 167 | f.write('require conf/locked-sigs.inc\n') |
168 | f.write('require conf/work-config.inc\n') | ||
169 | 168 | ||
170 | sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc' | 169 | sigfile = d.getVar('WORKDIR', True) + '/locked-sigs.inc' |
171 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) | 170 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) |
@@ -185,10 +184,6 @@ python copy_buildsystem () { | |||
185 | d.getVar('SSTATE_DIR', True), | 184 | d.getVar('SSTATE_DIR', True), |
186 | sstate_out, d, | 185 | sstate_out, d, |
187 | fixedlsbstring) | 186 | fixedlsbstring) |
188 | |||
189 | # Create a dummy config file for additional settings | ||
190 | with open(baseoutpath + '/conf/work-config.inc', 'w') as f: | ||
191 | pass | ||
192 | } | 187 | } |
193 | 188 | ||
194 | def extsdk_get_buildtools_filename(d): | 189 | 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): | |||
170 | logger.error("Updating meta data via git failed") | 170 | logger.error("Updating meta data via git failed") |
171 | return ret | 171 | return ret |
172 | logger.debug("Updating conf files ...") | 172 | logger.debug("Updating conf files ...") |
173 | conf_files = ['local.conf', 'bblayers.conf', 'devtool.conf', 'work-config.inc', 'locked-sigs.inc'] | 173 | conf_files = ['local.conf', 'bblayers.conf', 'devtool.conf', 'locked-sigs.inc'] |
174 | for conf in conf_files: | 174 | for conf in conf_files: |
175 | ret = subprocess.call("wget -q -O - %s/conf/%s > conf/%s" % (args.updateserver, conf, conf), shell=True) | 175 | ret = subprocess.call("wget -q -O - %s/conf/%s > conf/%s" % (args.updateserver, conf, conf), shell=True) |
176 | if ret != 0: | 176 | if ret != 0: |