[yocto-autobuilder][PATCH] yoctogit: add init to submodule update

[yocto-autobuilder][PATCH] yoctogit: add init to submodule update

[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.

Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
---
 .../buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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
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
@@ -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

Re: [yocto-autobuilder][PATCH] yoctogit: add init to submodule update

[Joshua Lock]

On Sat, 2017-07-15 at 12:33 -0700, Stephano Cetola wrote:
> 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

> 
> Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
> ---
>  .../buildbot-0.8.8-
> py2.7.egg/buildbot/steps/source/yoctogit.py          | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git 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
> 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
> @@ -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
>