summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
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 12:30:49 +0000
commit1e29b57e9278f7d62e6357b5893556acdc0d4b9e (patch)
treef9ad8c0fcb7f969ba76664cb69e60887d8d965f6 /scripts/lib/devtool
parentaf867199a5df1b0416f1d1b91427c028d4fa2efd (diff)
downloadpoky-1e29b57e9278f7d62e6357b5893556acdc0d4b9e.tar.gz
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. (From OE-Core rev: 38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5) 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/lib/devtool')
-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):
28 """Entry point for the devtool 'package' subcommand""" 28 """Entry point for the devtool 'package' subcommand"""
29 check_workspace_recipe(workspace, args.recipename) 29 check_workspace_recipe(workspace, args.recipename)
30 30
31 tinfoil = setup_tinfoil(basepath=basepath) 31 tinfoil = setup_tinfoil(basepath=basepath, config_only=True)
32 try: 32 try:
33 tinfoil.prepare(config_only=True)
34
35 image_pkgtype = config.get('Package', 'image_pkgtype', '') 33 image_pkgtype = config.get('Package', 'image_pkgtype', '')
36 if not image_pkgtype: 34 if not image_pkgtype:
37 image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True) 35 image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE', True)