summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-14 21:49:50 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-14 09:56:32 +0000
commit38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5 (patch)
treed7eafea1a8d21fc317b6e843bffa2b71957a91c8 /scripts
parentfb37304d27857df3c53c0867e81fbc8899b48089 (diff)
downloadopenembedded-core-contrib-38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5.tar.gz
openembedded-core-contrib-38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5.tar.bz2
openembedded-core-contrib-38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5.zip
devtool: package: don't try to initialise tinfoil twice
setup_tinfoil() already calls prepare(), we don't need to call it again ourselves and doing so with tinfoil2 results in "ERROR: Only one copy of bitbake should be run against a build directory". Calling prepare() twice should probably still be allowed, so that ought to be fixed separately, but in the mean time this code is still wrong so fix it here. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/devtool/package.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/lib/devtool/package.py b/scripts/lib/devtool/package.py
index afb5809a36..47640641d1 100644
--- a/scripts/lib/devtool/package.py
+++ b/scripts/lib/devtool/package.py
@@ -28,10 +28,8 @@ def package(args, config, basepath, workspace):
"""Entry point for the devtool 'package' subcommand"""
check_workspace_recipe(workspace, args.recipename)
- tinfoil = setup_tinfoil(basepath=basepath)
+ tinfoil = setup_tinfoil(basepath=basepath, config_only=True)
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)