[oe-commits] Paul Eggleton : devtool: deploy-target: detect and error if D is empty
git at git.openembedded.org
git at git.openembedded.org
Fri Mar 20 11:10:09 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 3fd9ac277393bef5c646f16b9d8f30c277881d70
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3fd9ac277393bef5c646f16b9d8f30c277881d70
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Sun Mar 8 12:51:36 2015 +0000
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 at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
scripts/lib/devtool/deploy.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index d232d31..68edb98 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'
More information about the Openembedded-commits
mailing list