[OE-core] [PATCH 1/1] devtool.py: remove fetch results from download directory to avoid failure

Chen Qi Qi.Chen at windriver.com
Mon Jan 21 09:29:59 UTC 2019


The fetch results need to be removed from the download directory to avoid
failures like below.

  Submodule path 'doxyport': checked out 'db3e1a6eb8677d3166d90d82c3068689803ce547'

  fatal: reference is not a tree: 67cad692720982ac3cbd99bf1c3421edc69b08f9
  Unable to checkout '67cad692720982ac3cbd99bf1c3421edc69b08f9' in submodule path 'doxygen2jsdoc'

  ERROR: Function failed: base_do_unpack

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 meta/lib/oeqa/selftest/cases/devtool.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 9eb9bad..4fcbdc3 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -446,6 +446,7 @@ class DevtoolAddTests(DevtoolBase):
         # Test devtool add
         self.track_for_cleanup(self.workspacedir)
         self.add_command_to_tearDown('bitbake -c cleansstate %s' % testrecipe)
+        self.add_command_to_tearDown('rm -rf %s/git2/*%s*' % (get_bb_var('DL_DIR', None), testrecipe))
         self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
         result = runCmd('devtool add %s %s -a -f %s' % (testrecipe, srcdir, url))
         self.assertExists(os.path.join(self.workspacedir, 'conf', 'layer.conf'), 'Workspace directory not created: %s' % result.output)
@@ -464,6 +465,8 @@ class DevtoolAddTests(DevtoolBase):
         checkvars['SRCREV'] = '${AUTOREV}'
         self._test_recipe_contents(recipefile, checkvars, [])
         # Try with revision and version specified
+        result = runCmd('bitbake -c cleansstate %s' % testrecipe)
+        result = runCmd('rm -rf %s/git2/*%s*' % (get_bb_var('DL_DIR', None), testrecipe))
         result = runCmd('devtool reset -n %s' % testrecipe)
         shutil.rmtree(srcdir)
         url_rev = '%s;rev=%s' % (url, checkrev)
-- 
1.9.1



More information about the Openembedded-core mailing list