diff options
| -rw-r--r-- | scripts/lib/devtool/package.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/scripts/lib/devtool/package.py b/scripts/lib/devtool/package.py index b8d84235c8..53d3dc7a38 100644 --- a/scripts/lib/devtool/package.py +++ b/scripts/lib/devtool/package.py @@ -32,14 +32,17 @@ def package(args, config, basepath, workspace): """Entry point for the devtool 'package' subcommand""" check_workspace_recipe(workspace, args.recipename) - image_pkgtype = config.get('Package', 'image_pkgtype', '') - if not image_pkgtype: - tinfoil = setup_tinfoil(basepath=basepath) - try: - tinfoil.prepare(config_only=True) + tinfoil = setup_tinfoil(basepath=basepath) + try: + tinfoil.prepare(config_only=True) + + image_pkgtype = config.get('Package', 'image_pkgtype', '') + if not image_pkgtype: image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True) - finally: - tinfoil.shutdown() + + deploy_dir_pkg = tinfoil.config_data.getVar('DEPLOY_DIR_%s' % image_pkgtype.upper(), True) + finally: + tinfoil.shutdown() package_task = config.get('Package', 'package_task', 'package_write_%s' % image_pkgtype) try: @@ -47,7 +50,8 @@ def package(args, config, basepath, workspace): except bb.process.ExecutionError as e: # We've already seen the output since watch=True, so just ensure we return something to the user return e.exitcode - logger.info('Your packages are in %s/tmp/deploy/%s' % (basepath, image_pkgtype)) + + logger.info('Your packages are in %s' % deploy_dir_pkg) return 0 |