diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-03-08 12:51:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:03:12 +0000 |
| commit | 3fd9ac277393bef5c646f16b9d8f30c277881d70 (patch) | |
| tree | 18ba6732bd61bb4763ef45b183cc9c0077222bdd /scripts/lib | |
| parent | 81dd1319112a99bc38b7a7ced0663918ac5b09a4 (diff) | |
| download | openembedded-core-3fd9ac277393bef5c646f16b9d8f30c277881d70.tar.gz openembedded-core-3fd9ac277393bef5c646f16b9d8f30c277881d70.tar.bz2 openembedded-core-3fd9ac277393bef5c646f16b9d8f30c277881d70.zip | |
devtool: deploy-target: detect and error if D is empty
If you haven't built the recipe yet or if the output directory (${D}) is
empty, then we should tell the user rather than have scp error out.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/devtool/deploy.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py index d232d3179f..68edb98113 100644 --- a/scripts/lib/devtool/deploy.py +++ b/scripts/lib/devtool/deploy.py @@ -43,13 +43,17 @@ def deploy(args, config, basepath, workspace): deploy_dir = os.path.join(basepath, 'target_deploy', args.target) deploy_file = os.path.join(deploy_dir, args.recipename + '.list') + stdout, stderr = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True) + recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1) + if not os.path.exists(recipe_outdir) or not os.listdir(recipe_outdir): + logger.error('No files to deploy - have you built the %s recipe? If so, the install step has not installed any files.' % args.recipename) + return -1 + if os.path.exists(deploy_file): if undeploy(args, config, basepath, workspace): # Error already shown return -1 - stdout, stderr = exec_build_env_command(config.init_path, basepath, 'bitbake -e %s' % args.recipename, shell=True) - recipe_outdir = re.search(r'^D="(.*)"', stdout, re.MULTILINE).group(1) extraoptions = '' if args.no_host_check: extraoptions += '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' |