[PATCH 0/2] A couple of devtool fixes

[PATCH 0/2] A couple of devtool fixes

[Paul Eggleton]

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(-)

-- 
2.1.0

[PATCH 1/2] devtool: use tinfoil shutdown method

[Paul Eggleton]

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.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 scripts/devtool | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/devtool b/scripts/devtool
index 557a830..5d37d3b 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -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>')
 
-- 
2.1.0

[PATCH 2/2] oe-selftest: devtool: fix teardown warning in test_devtool_update_recipe_append

[Paul Eggleton]

We don't need to run bitbake -c cleansstate on this because it's being
cleaned out as part of "devtool reset".

Addresses [YOCTO #8031].

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/lib/oeqa/selftest/devtool.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py
index c833e54..b59db15 100644
--- a/meta/lib/oeqa/selftest/devtool.py
+++ b/meta/lib/oeqa/selftest/devtool.py
@@ -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)
-- 
2.1.0

[PATCH 0/2] A couple of devtool fixes

[Paul Eggleton]

A fix for devtool modify and other source extracting subcommands to
handle dependencies, and a fix for devtool modify within the eSDK.

NOTE: the patch I just sent to the bitbake list is required for patch
1/2 to work.


The following changes since commit 2ebbeb61114e4b847e9164c621ac87b5cf03a299:

  staging: gracefully abort if two recipes conflict in the sysroot (2017-09-11 17:30:15 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/devtool30-oe
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/devtool30-oe

Paul Eggleton (2):
  devtool: rework source extraction so that dependencies are handled
  devtool: ensure recipes devtool is working on are unlocked within the eSDK

 meta/classes/devtool-source.bbclass     | 165 ++++++++++++++++++++++++
 meta/classes/populate_sdk_ext.bbclass   |   3 +
 meta/classes/sstate.bbclass             |   9 +-
 meta/lib/oeqa/selftest/cases/devtool.py |  10 +-
 scripts/devtool                         |  20 ---
 scripts/lib/devtool/__init__.py         |  40 ++++++
 scripts/lib/devtool/standard.py         | 218 ++++++++++----------------------
 scripts/lib/devtool/upgrade.py          |   9 +-
 8 files changed, 296 insertions(+), 178 deletions(-)
 create mode 100644 meta/classes/devtool-source.bbclass

-- 
2.9.5