Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Olof Johansson <olof.johansson@axis.com>,
	openembedded-core@lists.openembedded.org
Subject: Re: [PATCH] devtool-source.bbclass: Only create each patch branch once
Date: Thu, 11 Oct 2018 10:34:30 +0100	[thread overview]
Message-ID: <ad0c4f9df33f9dfbece0d5e178779388c1b6d61c.camel@linuxfoundation.org> (raw)
In-Reply-To: <20181010153528.9110-1-olofjn@axis.com>

On Wed, 2018-10-10 at 17:35 +0200, Olof Johansson wrote:
> For conditonally applied patches based on SRC_URI overrides, the
> devtool-source class would try to create a new branch for each
> override
> assignment as a postfunc to do_patch, but if the same override was
> used
> multiple times, it would try to create the same branch multiple
> times,
> causing errors like
> 
> > Exception: bb.process.ExecutionError: Execution of
> 
> \   'git checkout f0f0f0f0f0ff0f0f0f0f0f0f0f0f0f0f0ff0f0f0 -b
> devtool-override-foo'
> \   failed with exit code 128:
> > fatal: A branch named 'devtool-override-foo' already exists.
> 
> This change makes sure that the devtool-source bbclass will only
> create
> one branch per override.
> 
> Change-Id: I8adca0b54179793ca92478ad5b3b1b6e0448e26b
> Signed-off-by: Olof Johansson <olofjn@axis.com>
> ---
>  meta/classes/devtool-source.bbclass | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)

This breaks the oe-selftest devtool tests:

https://autobuilder.yoctoproject.org/typhoon/api/v2/logs/46751/raw

oe-selftest -r devtool

should reproduce.

Cheers,

Richard



  parent reply	other threads:[~2018-10-11  9:34 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-10 15:35 [PATCH] devtool-source.bbclass: Only create each patch branch once Olof Johansson
2018-10-10 15:48 ` Peter Kjellerstedt
2018-10-10 18:25   ` Olof Johansson
2018-10-11  9:34 ` Richard Purdie [this message]
2018-10-11 11:51   ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2018-10-19 16:00 Olof Johansson
2018-10-19 16:06 ` Olof Johansson

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=ad0c4f9df33f9dfbece0d5e178779388c1b6d61c.camel@linuxfoundation.org \
    --to=richard.purdie@linuxfoundation.org \
    --cc=olof.johansson@axis.com \
    --cc=openembedded-core@lists.openembedded.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox