diff options
| -rw-r--r-- | scripts/lib/devtool/deploy.py | 4 | ||||
| -rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index e46ee0530a..4f968c6f21 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py | |||
| @@ -42,7 +42,7 @@ def deploy(args, config, basepath, workspace): | |||
| 42 | deploy_dir = os.path.join(basepath, 'target_deploy', args.target) | 42 | deploy_dir = os.path.join(basepath, 'target_deploy', args.target) |
| 43 | deploy_file = os.path.join(deploy_dir, args.recipename + '.list') | 43 | deploy_file = os.path.join(deploy_dir, args.recipename + '.list') |
| 44 | 44 | ||
| 45 | stdout, stderr = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True) | 45 | stdout, _ = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True) |
| 46 | recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1) | 46 | recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1) |
| 47 | if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir): | 47 | if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir): |
| 48 | logger.error('No files to deploy - have you built the %s recipe? If so, the install step has not installed any files.' % args.recipename) | 48 | logger.error('No files to deploy - have you built the %s recipe? If so, the install step has not installed any files.' % args.recipename) |
| @@ -50,7 +50,7 @@ def deploy(args, config, basepath, workspace): | |||
| 50 | 50 | ||
| 51 | if args.dry_run: | 51 | if args.dry_run: |
| 52 | print('Files to be deployed for %s on target %s:' % (args.recipename, args.target)) | 52 | print('Files to be deployed for %s on target %s:' % (args.recipename, args.target)) |
| 53 | for root, dirs, files in os.walk(recipe_outdir): | 53 | for root, _, files in os.walk(recipe_outdir): |
| 54 | for fn in files: | 54 | for fn in files: |
| 55 | print(' %s' % os.path.join(destdir, os.path.relpath(root, recipe_outdir), fn)) | 55 | print(' %s' % os.path.join(destdir, os.path.relpath(root, recipe_outdir), fn)) |
| 56 | return 0 | 56 | return 0 |
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 3e7b54e885..a9dd3b2c2f 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py | |||
| @@ -94,7 +94,7 @@ def add(args, config, basepath, workspace): | |||
| 94 | source = srctree | 94 | source = srctree |
| 95 | if args.version: | 95 | if args.version: |
| 96 | extracmdopts += ' -V %s' % args.version | 96 | extracmdopts += ' -V %s' % args.version |
| 97 | stdout, stderr = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create -o %s "%s" %s' % (color, recipefile, source, extracmdopts)) | 97 | stdout, _ = exec_build_env_command(config.init_path, basepath, 'recipetool --color=%s create -o %s "%s" %s' % (color, recipefile, source, extracmdopts)) |
| 98 | logger.info('Recipe %s has been automatically created; further editing may be required to make it fully functional' % recipefile) | 98 | logger.info('Recipe %s has been automatically created; further editing may be required to make it fully functional' % recipefile) |
| 99 | 99 | ||
| 100 | _add_md5(config, args.recipename, recipefile) | 100 | _add_md5(config, args.recipename, recipefile) |
