diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-12-14 21:49:50 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-14 12:30:49 +0000 |
| commit | 1e29b57e9278f7d62e6357b5893556acdc0d4b9e (patch) | |
| tree | f9ad8c0fcb7f969ba76664cb69e60887d8d965f6 | |
| parent | af867199a5df1b0416f1d1b91427c028d4fa2efd (diff) | |
| download | openembedded-core-contrib-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>
| -rw-r--r-- | scripts/lib/devtool/package.py | 4 |
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) |