A couple of devtool fixes
cover A couple of devtool fixes
Fix bitbake.lock handling in devtool (must be applied after the bitbake.lock patch just sent to the bitbake list) as well as a warning fix for the devtool oe-selftest tests.
The following changes since commit 27d068d05239c26a3848eb101571acab54635e37:
harfbuzz: upgrade to 1.0.1 (2015-07-27 23:28:23 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/devtool-bblock-fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/devtool-bblock-fix
Paul Eggleton (2):
devtool: use tinfoil shutdown method
oe-selftest: devtool: fix teardown warning in
test_devtool_update_recipe_append
meta/lib/oeqa/selftest/devtool.py | 1 - scripts/devtool | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/2 devtool: use tinfoil shutdown method
Tinfoil now has its own shutdown method, use it instead of calling into cooker - not only is it the right thing to do from an API perspective, it also ensures proper lock handling.
--- scripts/devtool | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
scripts/devtool +1 -2
@@ -244,8 +244,7 @@ def main(): tinfoil.config_data.getVar('BBPATH', True).split(':')): pluginpath = os.path.join(path, 'lib', 'devtool') scriptutils.load_plugins(logger, plugins, pluginpath) - tinfoil.cooker.shutdown(force=True) - tinfoil.cooker.unlockBitbake() + tinfoil.shutdown() subparsers = parser.add_subparsers(dest="subparser_name", title='subcommands', metavar='<subcommand>')
Signature · 1 line
2.1.0
PATCH 2/2 oe-selftest: devtool: fix teardown warning in test_devtool_update_recipe_append
In reply to Paul EggletonWe don't need to run bitbake -c cleansstate on this because it's being cleaned out as part of "devtool reset".
Addresses [YOCTO #8031].
--- meta/lib/oeqa/selftest/devtool.py | 1 - 1 file changed, 1 deletion(-)
meta/lib/oeqa/selftest/devtool.py +0 -1
@@ -170,7 +170,6 @@ class DevtoolTests(DevtoolBase): bitbake('libftdi -c cleansstate') # Test devtool build result = runCmd('devtool build libftdi') - self.add_command_to_tearDown('bitbake -c cleansstate libftdi') staging_libdir = get_bb_var('STAGING_LIBDIR', 'libftdi') self.assertTrue(staging_libdir, 'Could not query STAGING_LIBDIR variable') self.assertTrue(os.path.isfile(os.path.join(staging_libdir, 'libftdi1.so.2.1.0')), "libftdi binary not found in STAGING_LIBDIR. Output of devtool build libftdi %s" % result.output)
Signature · 1 line
2.1.0