aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-10-11 18:40:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:30:54 +0000
commit06d47777ed1650c479fadf98388f9a3a1f1f9eda (patch)
tree525b4beddc1cc2bd52e78efb82201b0912f92c4d /scripts/lib
parent90cba7992bc1d227e242666cd486414bd4a45f7e (diff)
downloadopenembedded-core-contrib-06d47777ed1650c479fadf98388f9a3a1f1f9eda.tar.gz
devtool: package: use DEPLOY_DIR_<pkgtype> to get deploy directory
Rather than reconstructing the output path for packages, use the proper variable. 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/package.py20
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