[OE-core] [PATCH 3/5] devtool: extract: cleanup srctree
Markus Lehtonen
markus.lehtonen at linux.intel.com
Fri Dec 18 08:39:43 UTC 2015
Some bitbake tasks, notably do_kernel_metadata et al. dirty the
sourcetree. Run git clean in order to get rid of the confusing and
possibly outdated extra files.
Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
---
scripts/lib/devtool/standard.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 43fce11..f817671 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -458,10 +458,21 @@ def _extract_source(srctree, keep_temp, devbranch, sync, d):
bb.process.run('git checkout patches', cwd=srcsubdir)
if bb.data.inherits_class('kernel-yocto', d):
- # Store generate and store kernel config
logger.info('Generating kernel config')
task_executor.exec_func('do_configure', False)
kconfig = os.path.join(crd.getVar('B', True), '.config')
+ else:
+ kconfig = None
+
+ # Clean source tree in case it has been dirtied by some bitbake task
+ stdout, _ = bb.process.run('git status --porcelain --ignored',
+ cwd=srcsubdir)
+ if stdout:
+ logger.info('Source tree is dirty, cleaning up')
+ bb.process.run('git clean -fdx', cwd=srcsubdir)
+
+ if kconfig:
+ # Store kernel config in srctree
shutil.copy2(kconfig, srcsubdir)
--
2.1.4
More information about the Openembedded-core
mailing list