diff options
Diffstat (limited to 'scripts/lib/devtool/standard.py')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 0104e675db..54558ce799 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -30,7 +30,7 @@ import errno import glob import filecmp from collections import OrderedDict -from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, ensure_npm, DevtoolError +from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recipe, use_external_build, setup_git_repo, recipe_to_append, get_bbclassextend_targets, DevtoolError from devtool import parse_recipe logger = logging.getLogger('devtool') @@ -128,9 +128,6 @@ def add(args, config, basepath, workspace): color = args.color extracmdopts = '' if args.fetchuri: - if args.fetchuri.startswith('npm://'): - ensure_npm(config, basepath, args.fixed_setup) - source = args.fetchuri if srctree: extracmdopts += ' -x %s' % srctree @@ -155,28 +152,13 @@ def add(args, config, basepath, workspace): tempdir = tempfile.mkdtemp(prefix='devtool') try: - builtnpm = False - while True: - try: - stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create --devtool -o %s \'%s\' %s' % (color, tempdir, source, extracmdopts), watch=True) - except bb.process.ExecutionError as e: - if e.exitcode == 14: - if builtnpm: - raise DevtoolError('Re-running recipetool still failed to find npm') - # FIXME this is a horrible hack that is unfortunately - # necessary due to the fact that we can't run bitbake from - # inside recipetool since recipetool keeps tinfoil active - # with references to it throughout the code, so we have - # to exit out and come back here to do it. - ensure_npm(config, basepath, args.fixed_setup, check_exists=False) - logger.info('Re-running recipe creation process after building nodejs') - builtnpm = True - continue - elif e.exitcode == 15: - raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line') - else: - raise DevtoolError('Command \'%s\' failed' % e.command) - break + try: + stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create --devtool -o %s \'%s\' %s' % (color, tempdir, source, extracmdopts), watch=True) + except bb.process.ExecutionError as e: + if e.exitcode == 15: + raise DevtoolError('Could not auto-determine recipe name, please specify it on the command line') + else: + raise DevtoolError('Command \'%s\' failed' % e.command) recipes = glob.glob(os.path.join(tempdir, '*.bb')) if recipes: |