summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-08-19 09:27:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-21 22:51:42 +0100
commitf2fb3c54a34ce925b7d3dff8955b78cb0e54e7f0 (patch)
treeb452661b17739ebd9fda54830495f8ba4fa6c20f /meta/lib
parent5aca6cdb59e844e7b573bd669be2e980093bbdb5 (diff)
downloadpoky-f2fb3c54a34ce925b7d3dff8955b78cb0e54e7f0.tar.gz
devtool: do not leave behind source trees in workspace/sources
These are typically auto-extracted with modify/upgrade from recipes and can be easily recreated. On the rare occasions where they need to be reused, they are still available under workspace/attic (which is already used for old recipes and appends), so nothing gets lost. This avoids the annoyance of devtool refusing to proceed because there is a previous source tree in workspace/sources. For independent source trees behave as before: do nothing. Adjust the test that previously deleted those trees by hand. (From OE-Core rev: 9bfb95d070d68d5ab5adfe0ea096f5fbf9cad8b0) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index ec08ac6d60..142932e12f 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -1957,7 +1957,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1957 self._test_recipe_contents(newrecipefile, checkvars, []) 1957 self._test_recipe_contents(newrecipefile, checkvars, [])
1958 # Try again - change just name this time 1958 # Try again - change just name this time
1959 result = runCmd('devtool reset -n %s' % newrecipename) 1959 result = runCmd('devtool reset -n %s' % newrecipename)
1960 shutil.rmtree(newsrctree)
1961 add_recipe() 1960 add_recipe()
1962 newrecipefile = os.path.join(self.workspacedir, 'recipes', newrecipename, '%s_%s.bb' % (newrecipename, recipever)) 1961 newrecipefile = os.path.join(self.workspacedir, 'recipes', newrecipename, '%s_%s.bb' % (newrecipename, recipever))
1963 result = runCmd('devtool rename %s %s' % (recipename, newrecipename)) 1962 result = runCmd('devtool rename %s %s' % (recipename, newrecipename))
@@ -1970,7 +1969,6 @@ class DevtoolUpgradeTests(DevtoolBase):
1970 self._test_recipe_contents(newrecipefile, checkvars, []) 1969 self._test_recipe_contents(newrecipefile, checkvars, [])
1971 # Try again - change just version this time 1970 # Try again - change just version this time
1972 result = runCmd('devtool reset -n %s' % newrecipename) 1971 result = runCmd('devtool reset -n %s' % newrecipename)
1973 shutil.rmtree(newsrctree)
1974 add_recipe() 1972 add_recipe()
1975 newrecipefile = os.path.join(self.workspacedir, 'recipes', recipename, '%s_%s.bb' % (recipename, newrecipever)) 1973 newrecipefile = os.path.join(self.workspacedir, 'recipes', recipename, '%s_%s.bb' % (recipename, newrecipever))
1976 result = runCmd('devtool rename %s -V %s' % (recipename, newrecipever)) 1974 result = runCmd('devtool rename %s -V %s' % (recipename, newrecipever))