summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-10-11 17:40:28 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:03 (GMT)
commit176211abebb875324d2300ec0362b64231668964 (patch)
treed948aa5d190093a4227234992f80b1fe0868644e /scripts
parent0fe742674e9a37e7b352065a1b524d37e5a41137 (diff)
downloadpoky-176211abebb875324d2300ec0362b64231668964.tar.gz
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>
Diffstat (limited to 'scripts')
-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 b8d8423..53d3dc7 100644
--- a/scripts/lib/devtool/package.py
+++ b/scripts/lib/devtool/package.py
@@ -32,14 +32,17 @@ def package(args, config, basepath, workspace):
32 """Entry point for the devtool 'package' subcommand""" 32 """Entry point for the devtool 'package' subcommand"""
33 check_workspace_recipe(workspace, args.recipename) 33 check_workspace_recipe(workspace, args.recipename)
34 34
35 image_pkgtype = config.get('Package', 'image_pkgtype', '') 35 tinfoil = setup_tinfoil(basepath=basepath)
36 if not image_pkgtype: 36 try:
37 tinfoil = setup_tinfoil(basepath=basepath) 37 tinfoil.prepare(config_only=True)
38 try: 38
39 tinfoil.prepare(config_only=True) 39 image_pkgtype = config.get('Package', 'image_pkgtype', '')
40 if not image_pkgtype:
40 image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True) 41 image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True)
41 finally: 42
42 tinfoil.shutdown() 43 deploy_dir_pkg = tinfoil.config_data.getVar('DEPLOY_DIR_%s' % image_pkgtype.upper(), True)
44 finally:
45 tinfoil.shutdown()
43 46
44 package_task = config.get('Package', 'package_task', 'package_write_%s' % image_pkgtype) 47 package_task = config.get('Package', 'package_task', 'package_write_%s' % image_pkgtype)
45 try: 48 try:
@@ -47,7 +50,8 @@ def package(args, config, basepath, workspace):
47 except bb.process.ExecutionError as e: 50 except bb.process.ExecutionError as e:
48 # We've already seen the output since watch=True, so just ensure we return something to the user 51 # We've already seen the output since watch=True, so just ensure we return something to the user
49 return e.exitcode 52 return e.exitcode
50 logger.info('Your packages are in %s/tmp/deploy/%s' % (basepath, image_pkgtype)) 53
54 logger.info('Your packages are in %s' % deploy_dir_pkg)
51 55
52 return 0 56 return 0
53 57