All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joshua Lock <joshua.g.lock@linux.intel.com>
To: Stephano Cetola <stephano.cetola@linux.intel.com>,
	yocto@yoctoproject.org
Subject: Re: [yocto-autobuilder][PATCH] yoctogit: add init to submodule update
Date: Mon, 17 Jul 2017 15:03:02 +0100	[thread overview]
Message-ID: <1500300182.3198.7.camel@linux.intel.com> (raw)
In-Reply-To: <20170715193313.63041-1-stephano.cetola@linux.intel.com>

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
> 


      reply	other threads:[~2017-07-17 14:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-15 19:33 [yocto-autobuilder][PATCH] yoctogit: add init to submodule update Stephano Cetola
2017-07-17 14:03 ` Joshua Lock [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1500300182.3198.7.camel@linux.intel.com \
    --to=joshua.g.lock@linux.intel.com \
    --cc=stephano.cetola@linux.intel.com \
    --cc=yocto@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.