diff options
Diffstat (limited to 'scripts/lib/devtool/__init__.py')
-rw-r--r-- | scripts/lib/devtool/__init__.py | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 29c4c05071..bba0721543 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py | |||
@@ -261,34 +261,3 @@ def get_bbclassextend_targets(recipefile, pn): | |||
261 | targets.append('%s-%s' % (pn, variant)) | 261 | targets.append('%s-%s' % (pn, variant)) |
262 | return targets | 262 | return targets |
263 | 263 | ||
264 | def ensure_npm(config, basepath, fixed_setup=False, check_exists=True): | ||
265 | """ | ||
266 | Ensure that npm is available and either build it or show a | ||
267 | reasonable error message | ||
268 | """ | ||
269 | if check_exists: | ||
270 | tinfoil = setup_tinfoil(config_only=False, basepath=basepath) | ||
271 | try: | ||
272 | rd = tinfoil.parse_recipe('nodejs-native') | ||
273 | nativepath = rd.getVar('STAGING_BINDIR_NATIVE') | ||
274 | finally: | ||
275 | tinfoil.shutdown() | ||
276 | npmpath = os.path.join(nativepath, 'npm') | ||
277 | build_npm = not os.path.exists(npmpath) | ||
278 | else: | ||
279 | build_npm = True | ||
280 | |||
281 | if build_npm: | ||
282 | logger.info('Building nodejs-native') | ||
283 | try: | ||
284 | exec_build_env_command(config.init_path, basepath, | ||
285 | 'bitbake -q nodejs-native -c addto_recipe_sysroot', watch=True) | ||
286 | except bb.process.ExecutionError as e: | ||
287 | if "Nothing PROVIDES 'nodejs-native'" in e.stdout: | ||
288 | if fixed_setup: | ||
289 | msg = 'nodejs-native is required for npm but is not available within this SDK' | ||
290 | else: | ||
291 | msg = 'nodejs-native is required for npm but is not available - you will likely need to add a layer that provides nodejs' | ||
292 | raise DevtoolError(msg) | ||
293 | else: | ||
294 | raise | ||