Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: openembedded-core@lists.openembedded.org, saul.wold@intel.com
Subject: Re: [PATCH 0/1] linux-yocto: update meta branch SRCREV
Date: Wed, 15 Jun 2011 10:36:31 +0100	[thread overview]
Message-ID: <1308130591.15712.371.camel@rex> (raw)
In-Reply-To: <cover.1308110508.git.bruce.ashfield@windriver.com>

On Wed, 2011-06-15 at 00:05 -0400, Bruce Ashfield wrote:
> Richard/Saul,
> 
> The patch really says it all, so I'm repeating it here:
> 
> [    
>   Updating the meta SRCREV to fix a bad commit which resulted in the
>   tree being dirty after checkpoint, and hence a failure during the
>   patch phase. The meta commits never modify code outside the 'meta'
>   directory tree, a rule that was broken with this bad commit.
> 
>   Without this fix, you may see an error like:
> 
>   | [INFO] doing kernel configme
>   | [INFO] Finding user(s) of branch "yocto/standard/fsl-mpc8315e-rdb"
>   | [INFO] Branch meta-temp used by fsl-mpc8315e-rdb-standard.scc
>   | [INFO] collecting configs in ./meta/meta-series
>   | [INFO] checking out yocto/standard/fsl-mpc8315e-rdb
>   | error: Your local changes to the following files would be overwritten by checkout:
>   | 	arch/powerpc/boot/dts/mpc8315erdb.dts
>   | Please, commit your changes or stash them before you can switch branches.
>   | Aborting
>   | [ERROR] Checkout of yocto/standard/fsl-mpc8315e-rdb failed
>   | Error running the meta series for collecting config data
>   | config of meta-temp (fsl-mpc8315e-rdb-standard.scc) failed
> ]
> 
> The linux-yocto tree was fixed a few days ago, and the dust has settled
> enough (I hope) on the recipe renames that this can now go out.
> 
> The following changes since commit 7aa7673459376aff911cef820c9417c998d1aa96:
>   Bruce Ashfield (1):
>         meta-yocto/linux-yocto: update to match the renamed linux-yocto recipes
> 
> are available in the git repository at:
> 
>   git://git.pokylinux.org/poky-contrib zedd/kernel
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
> 
> Bruce Ashfield (1):
>   linux-yocto: update meta branch SRCREV

Merged to master, thanks.

Richard




      parent reply	other threads:[~2011-06-15  9:40 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-15  4:05 [PATCH 0/1] linux-yocto: update meta branch SRCREV Bruce Ashfield
2011-06-15  4:05 ` [PATCH 1/1] " Bruce Ashfield
2011-06-15  9:36 ` Richard Purdie [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=1308130591.15712.371.camel@rex \
    --to=richard.purdie@linuxfoundation.org \
    --cc=bruce.ashfield@windriver.com \
    --cc=openembedded-core@lists.openembedded.org \
    --cc=saul.wold@intel.com \
    /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