sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

devtool: package: use DEPLOY_DIR_<pkgtype> to get deploy directory 

Rather than reconstructing the output path for packages, use the proper
variable.

(From OE-Core rev: 06d47777ed1650c479fadf98388f9a3a1f1f9eda)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton 2015-10-11 18:40:28 +01:00 committed by Richard Purdie
parent 0fe742674e
commit 176211abeb
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/lib/devtool/package.py
View File

@ -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