From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 3D69876536 for ; Sun, 30 Aug 2015 15:50:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t7UFo4Xd014352; Sun, 30 Aug 2015 16:50:04 +0100 Received: from dan.rpsys.net ([127.0.0.1]) by localhost (dan.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id WYsYvQMnESDc; Sun, 30 Aug 2015 16:50:04 +0100 (BST) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by dan.rpsys.net (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id t7UFno41014348 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT); Sun, 30 Aug 2015 16:50:01 +0100 Message-ID: <1440949789.32588.73.camel@linuxfoundation.org> From: Richard Purdie To: Bruce Ashfield Date: Sun, 30 Aug 2015 16:49:49 +0100 In-Reply-To: References: <1440943034.32588.70.camel@linuxfoundation.org> X-Mailer: Evolution 3.12.11-0ubuntu3 Mime-Version: 1.0 Cc: Patches and discussions about the oe-core layer Subject: Re: [PATCH 4/9] linux-yocto/3.14: cleanups and gcc5 ARM build fixes X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2015 15:50:08 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Sun, 2015-08-30 at 10:34 -0400, Bruce Ashfield wrote: > On Sun, Aug 30, 2015 at 10:30 AM, Bruce Ashfield > wrote: > > On Sun, Aug 30, 2015 at 9:57 AM, Richard Purdie > > 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 > >>> --- > >>> 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