summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-14 21:42:55 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-12-14 21:47:25 +1300
commite2e11be34f7fb40dccf7d2ba45c7e8f6a7a10929 (patch)
tree962a671b54f16ca9903aa18c5c2c2f5174128763
parent2eea6a65b009e9d47c03b7d82d2699f88228fc62 (diff)
downloadopenembedded-core-contrib-paule/tinfoil2-extra-fix.tar.gz
openembedded-core-contrib-paule/tinfoil2-extra-fix.tar.bz2
openembedded-core-contrib-paule/tinfoil2-extra-fix.zip
devtool: package: don't try to initialise tinfoil twicepaule/tinfoil2-extra-fix
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>
-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)