From: Paul Eggleton Date: Wed, 14 Dec 2016 08:49:50 +0000 (+1300) Subject: devtool: package: don't try to initialise tinfoil twice X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~23309 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38b8a7d4aff096ea0a62f2ddf3fe2de1df591bf5;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Ross Burton --- diff --git a/scripts/lib/devtool/package.py b/scripts/lib/devtool/package.py index afb5809a36b..47640641d16 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)