From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Bruce Ashfield <bruce.ashfield@gmail.com>
Cc: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 4/9] linux-yocto/3.14: cleanups and gcc5 ARM build fixes
Date: Sun, 30 Aug 2015 16:49:49 +0100 [thread overview]
Message-ID: <1440949789.32588.73.camel@linuxfoundation.org> (raw)
In-Reply-To: <CADkTA4M+Vkqg2LSgLXiryOTJtCHNwGOQJbp-8pjUifXNFADsaA@mail.gmail.com>
On Sun, 2015-08-30 at 10:34 -0400, Bruce Ashfield wrote:
> On Sun, Aug 30, 2015 at 10:30 AM, Bruce Ashfield
> <bruce.ashfield@gmail.com> wrote:
> > On Sun, Aug 30, 2015 at 9:57 AM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >> On Wed, 2015-08-26 at 22:31 -0400, Bruce Ashfield wrote:
> >>> Updating the 3.14 SRCREVs to match the latest kernel meta data updates
> >>> and also to merge four patches Richard Purdie located that fix the
> >>> gcc 5.x ARM build (we still have boot issues, but building is the
> >>> first step).
> >>>
> >>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> >>> ---
> >>> meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 6 +++---
> >>> meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 4 ++--
> >>> meta/recipes-kernel/linux/linux-yocto_3.14.bb | 18 +++++++++---------
> >>> 3 files changed, 14 insertions(+), 14 deletions(-)
> >>>
> >>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
> >>> index 0bd94f0c600d..d59f06b81c04 100644
> >>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
> >>> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
> >>> @@ -3,9 +3,9 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
> >>>
> >>> require recipes-kernel/linux/linux-yocto.inc
> >>>
> >>> -SRCREV_machine ?= "863ba0912f559ba9d64ab94bf04f0226fdf0cb49"
> >>> -SRCREV_machine_qemuppc ?= "9d464d6696a0fc755c65a2cf75ad7a4656ac6e1e"
> >>> -SRCREV_meta ?= "b55cfc0308bf7158843db4b8f69f866487a0919e"
> >>> +SRCREV_machine ?= "302ca233332fd364ecd028a0cf21b4cdc045e056"
> >>> +SRCREV_machine_qemuppc ?= "e4847afbb42583fa05e6a94c8d0c8f8e37ed5622"
> >>> +SRCREV_meta ?= "3a09b38a9f5015c56d99d17aa7c2f200c566249b"
> >>>
> >>
> >> I can't find e4847afbb42583fa05e6a94c8d0c8f8e37ed5622 on the
> >> standard/qemuppc branch? Did you miss a push?
> >>
> >> I merged this to master not realising this issue and the autobuilder is
> >> now unhappy so need to get this resolved one way or another ASAP :/.
> >
> > I'm out until tomorrow morning. So a revert is the only way to fix it quickly.
> >
> > As I mentioned in my pull request, I had to update all my scripts that do the
> > SRCREV updates for the meta branch split out .. so I warned that something
> > unexpected may have happened (with three kernel versions, and 3 types of
> > kernels across 8 boards ..).
>
> That being said, I did sneak in and check:
>
> > git push origin standard/preempt-rt/qemuppc
> Everything up-to-date
> > git branch --contains e4847afbb42583fa05e6a94c8d0c8f8e37ed5622
> standard/preempt-rt/qemuppc
>
> That's a merge commit on the top of the branch.
>
> If I get back early enough tonight, I'll look more.
If I have to guess, your scripts have taken the qemuppc -rt revision and
applied it to the qemuppc standard kernel (the non -rt version).
I'll try changing it to the standard/qemuppc revision instead (patch
pushed for that).
We also have an issue with 3.14 qemumips failing in do_patch:
https://autobuilder.yoctoproject.org/main/builders/nightly-mips-lsb/builds/464/steps/BuildImages/logs/stdio
I've not looked into that one.
Cheers,
Richard
next prev parent reply other threads:[~2015-08-30 15:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-27 2:31 [PATCH 0/9 v2] linux-yocto: consolidated pull request Bruce Ashfield
2015-08-27 2:31 ` [PATCH 1/9] linux-yocto/4.1: fix qemuarm preempt-rt configuration Bruce Ashfield
2015-08-27 2:31 ` [PATCH 2/9] linux-yocto/3.19/4.1: add coretemp to intel-common-drivers Bruce Ashfield
2015-08-27 2:31 ` [PATCH 3/9] linux-yocto/4.1: quark configuration and thermal support Bruce Ashfield
2015-08-27 2:31 ` [PATCH 4/9] linux-yocto/3.14: cleanups and gcc5 ARM build fixes Bruce Ashfield
2015-08-30 13:57 ` Richard Purdie
2015-08-30 14:30 ` Bruce Ashfield
2015-08-30 14:34 ` Bruce Ashfield
2015-08-30 15:49 ` Richard Purdie [this message]
2015-08-31 3:17 ` Bruce Ashfield
2015-08-31 7:14 ` Richard Purdie
2015-08-31 12:41 ` Bruce Ashfield
2015-08-27 2:31 ` [PATCH 5/9] linux-yocto/4.1: update to v4.1.6 and v4.1.6-rt5 Bruce Ashfield
2015-08-27 2:31 ` [PATCH 6/9] linux-yocto/4.1: enable DRM_CIRRUS_QEMU and EXT4_USE_FOR_EXT23 Bruce Ashfield
2015-08-27 2:31 ` [PATCH 7/9] linux-yocto/4.1: CIRRUS config and quark thermal support Bruce Ashfield
2015-08-27 2:31 ` [PATCH 8/9] linux-yocto-dev: update to 4.2-rc Bruce Ashfield
2015-08-27 2:31 ` [PATCH 9/9] linux-yocto/3.14/4.1: fix ARM boot with gcc 5.x Bruce Ashfield
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=1440949789.32588.73.camel@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=bruce.ashfield@gmail.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 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.