yoctogit: add init to submodule update

PATCH In review Stephano Cetola 2 participants 2 messages Jul 15, 2017 – Jul 17, 2017

Share & tools

Stephano Cetola

author

2017-07-15 19:33 UTC #0 lore raw

PATCH 1/1 yoctogit: add init to submodule update

We replaced buildbot's standard copy function with our _srccopy function when method=barecopy or movecopy. The srccopy will copy the contents of the "source" directory into the build dir. We cannot assume that submodules have not been added since the buildslave last populated the source dir. Adding --init to the git submodule update resolves this issue.

Signed-off-by Stephano Cetola <[email protected]>

---
 .../buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py +1 -1

index 389cf4f8f..ecf4d1a34 100644
@@ -604,7 +604,7 @@ class YoctoGit(Source):
 
     def _updateSubmodule(self, _):
         if self.submodules:
-            return self._dovccmd(['submodule', 'update', '--recursive'])
+            return self._dovccmd(['submodule', 'update', '--init', '--recursive'])
         else:
             return defer.succeed(0)

Signature · 1 line

2.13.2

Joshua Lock

2017-07-17 14:03 UTC #1 lore raw

Quoted 6 lines · Stephano Cetola

We replaced buildbot's standard copy function with our _srccopy function when method=barecopy or movecopy. The srccopy will copy the contents of the "source" directory into the build dir. We cannot assume that submodules have not been added since the buildslave last populated the source dir. Adding --init to the git submodule update resolves this issue.

Thanks for the fix! Merged.

Joshua

Quoted 29 lines

Signed-off-by Stephano Cetola <[email protected]>
---
.../buildbot-0.8.8- py2.7.egg/buildbot/steps/source/yoctogit.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0
py2.7.egg/buildbot/steps/source/yoctogit.py b/lib/python2.7/site- packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py index 389cf4f8f..ecf4d1a34 100644
--- a/lib/python2.7/site-packages/buildbot-0.8.8- py2.7.egg/buildbot/steps/source/yoctogit.py
+++ b/lib/python2.7/site-packages/buildbot-0.8.8- py2.7.egg/buildbot/steps/source/yoctogit.py
(quoted diff) +0 -0
@@ -604,7 +604,7 @@ class YoctoGit(Source):
     def _updateSubmodule(self, _):
         if self.submodules:
-            return self._dovccmd(['submodule', 'update', ' --recursive'])
+            return self._dovccmd(['submodule', 'update', '--init', '--recursive'])
         else:
             return defer.succeed(0)

--
2.13.2