diff options
Diffstat (limited to 'yocto-poky/scripts/lib/devtool/package.py')
| -rw-r--r-- | yocto-poky/scripts/lib/devtool/package.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/yocto-poky/scripts/lib/devtool/package.py b/yocto-poky/scripts/lib/devtool/package.py index b8d84235c..afb5809a3 100644 --- a/yocto-poky/scripts/lib/devtool/package.py +++ b/yocto-poky/scripts/lib/devtool/package.py @@ -24,22 +24,21 @@ from devtool import exec_build_env_command, setup_tinfoil, check_workspace_recip logger = logging.getLogger('devtool') -def plugin_init(pluginlist): - """Plugin initialization""" - pass - 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,13 +46,17 @@ 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 def register_commands(subparsers, context): """Register devtool subcommands from the package plugin""" if context.fixed_setup: - parser_package = subparsers.add_parser('package', help='Build packages for a recipe', description='Builds packages for a recipe\'s output files') + parser_package = subparsers.add_parser('package', + help='Build packages for a recipe', + description='Builds packages for a recipe\'s output files', + group='testbuild', order=-5) parser_package.add_argument('recipename', help='Recipe to package') parser_package.set_defaults(func=package) |