Skip to contentSkip to conversation

linux-yocto/3.19: update reference BSPs to 3.19

PATCH In review Bruce Ashfield 2 participants 5 messages Jun 5, 2015

lore
Share & tools
lore
#0 lore raw

cover linux-yocto/3.19: update reference BSPs to 3.19

Here's the first patch to update the h/w refernece BSPs to the 3.19 kernel.

I'll send a follow up patch to the yocto-bsp layer to bump the preferred kernel there as well.

Cheers,

Bruce

The following changes since commit fcc67ae90feeceee204bdb36e45eacf8d056779a:

xserver-xorg: Upgrade 1.16.3 -> 1.17.1 (OELAYOUT_ABI change) (2015-06-03 16:38:49 +0100)

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 beaglebone, mpc8315e and edgerouter to 3.19

 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 linux-yocto: update beaglebone, mpc8315e and edgerouter to 3.19

Bumping the linux-yocto SRCREVs to integrate fixes for the h/w reference BSPs to the 3.19 kernel.

---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)
meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb +2 -2
index 777aa60b14c4..6907060d3314 100644
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.19.5"
 KMETA = "meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
-SRCREV_meta ?= "727cfce45077a1f73f1dbc42e8093fde0c5e36a7"
+SRCREV_machine ?= "6c21811060c03100a32d0acc493df5fb3743b7c8"
+SRCREV_meta ?= "118f27167f4626fc7c71cefbec7c55a41d3a6d62"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_3.19.bb +9 -9
index 975b3afbf1d1..6218c02eca8b 100644
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e5aa4ad4249e079b8459a90b4ffa50d04b474458"
-SRCREV_machine_qemuarm64 ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
-SRCREV_machine_qemumips ?= "3b8cc925c5312b37cb824dfe58c2a4dcbb2b9732"
-SRCREV_machine_qemuppc ?= "4ac61cf97719f01c5cb226881956e77624fb534c"
-SRCREV_machine_qemux86 ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
-SRCREV_machine_qemux86-64 ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
-SRCREV_machine_qemumips64 ?= "f5bf944a0edde0e379af4296917d33a562e6586b"
-SRCREV_machine ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
-SRCREV_meta ?= "727cfce45077a1f73f1dbc42e8093fde0c5e36a7"
+SRCREV_machine_qemuarm ?= "c75bfc837fa8079278e77e8c122fe506c4ba7438"
+SRCREV_machine_qemuarm64 ?= "6c21811060c03100a32d0acc493df5fb3743b7c8"
+SRCREV_machine_qemumips ?= "b6aae264b3d4e74cc29a5db8c376840579d1f433"
+SRCREV_machine_qemuppc ?= "f6c2fa7ca86bd548cc96bd0ddf8aa89229e4c2c2"
+SRCREV_machine_qemux86 ?= "6c21811060c03100a32d0acc493df5fb3743b7c8"
+SRCREV_machine_qemux86-64 ?= "6c21811060c03100a32d0acc493df5fb3743b7c8"
+SRCREV_machine_qemumips64 ?= "d3a1f6f5501167c76fb662d518140133f5ce78c5"
+SRCREV_machine ?= "6c21811060c03100a32d0acc493df5fb3743b7c8"
+SRCREV_meta ?= "118f27167f4626fc7c71cefbec7c55a41d3a6d62"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
Signature · 1 line
2.1.0
#2 lore raw

Re: [PATCH 1/1] linux-yocto: update beaglebone, mpc8315e and edgerouter to 3.19

Quoted 3 lines · Bruce Ashfield

Bumping the linux-yocto SRCREVs to integrate fixes for the h/w reference BSPs to the 3.19 kernel.

edgerouter fails for me:

| /data/poky-master/tmp/work-shared/edgerouter/kernel-source/fs/aufs/i_op.c:
In function 'au_pin_hdir_set_owner':
| /data/poky-master/tmp/work-shared/edgerouter/kernel-source/fs/aufs/i_op.c:445:28:
error: 'struct mutex' has no member named 'owner'

|   p->hdir->hi_inode->i_mutex.owner = task;
|                             ^
|   LD      drivers/idle/built-in.o
|   CC      fs/aufs/i_op_del.o
|   LD      drivers/i2c/busses/built-in.o
|   CC      drivers/base/module.o
|   LD      drivers/i2c/muxes/built-in.o
|

/data/poky-master/tmp/work-shared/edgerouter/kernel-source/scripts/Makefile.build:257:
recipe for target 'fs/aufs/i_op.o' failed
| make[4]: *** [fs/aufs/i_op.o] Error 1

Ross

#3 lore raw

Re: [PATCH 1/1] linux-yocto: update beaglebone, mpc8315e and edgerouter to 3.19

Quoted 10 lines · Ross

On 5 June 2015 at 05:13, Bruce Ashfield <[email protected] <mailto:[email protected]>> wrote:

Bumping the linux-yocto SRCREVs to integrate fixes for the h/w reference BSPs to the 3.19 kernel.

edgerouter fails for me:

It's Kevin you should be cc'ing .. I'm just the guy that merges these ones :)

Kevin did fix this though .. I wonder if I did drop a patch, so I'll double check (maybe I was the right guy to cc' ')

Bruce

Quoted 19 lines

| /data/poky-master/tmp/work-shared/edgerouter/kernel-source/fs/aufs/i_op.c:
In function 'au_pin_hdir_set_owner':
| /data/poky-master/tmp/work-shared/edgerouter/kernel-source/fs/aufs/i_op.c:445:28:
error: 'struct mutex' has no member named 'owner'

|   p->hdir->hi_inode->i_mutex.owner = task;
|                             ^
|   LD      drivers/idle/built-in.o
|   CC      fs/aufs/i_op_del.o
|   LD      drivers/i2c/busses/built-in.o
|   CC      drivers/base/module.o
|   LD      drivers/i2c/muxes/built-in.o
|

/data/poky-master/tmp/work-shared/edgerouter/kernel-source/scripts/Makefile.build:257:
recipe for target 'fs/aufs/i_op.o' failed
| make[4]: *** [fs/aufs/i_op.o] Error 1

Ross

#4 lore raw

Re: [PATCH 1/1] linux-yocto: update beaglebone, mpc8315e and edgerouter to 3.19

In reply to Burton, Ross
Quoted 24 lines · Ross

On 5 June 2015 at 05:13, Bruce Ashfield <[email protected] <mailto:[email protected]>> wrote:

Bumping the linux-yocto SRCREVs to integrate fixes for the h/w reference BSPs to the 3.19 kernel.

edgerouter fails for me:

| /data/poky-master/tmp/work-shared/edgerouter/kernel-source/fs/aufs/i_op.c:
In function 'au_pin_hdir_set_owner':
| /data/poky-master/tmp/work-shared/edgerouter/kernel-source/fs/aufs/i_op.c:445:28:
error: 'struct mutex' has no member named 'owner'

|   p->hdir->hi_inode->i_mutex.owner = task;
|                             ^
|   LD      drivers/idle/built-in.o
|   CC      fs/aufs/i_op_del.o
|   LD      drivers/i2c/busses/built-in.o
|   CC      drivers/base/module.o
|   LD      drivers/i2c/muxes/built-in.o
|
Quoted 3 lines

/data/poky-master/tmp/work-shared/edgerouter/kernel-source/scripts/Makefile.build:257:
recipe for target 'fs/aufs/i_op.o' failed
| make[4]: *** [fs/aufs/i_op.o] Error 1

Indeed, we have this fix:

commit 6c21811060c03100a32d0acc493df5fb3743b7c8

Author: Kevin Hao <[email protected]>
Date:   Wed May 27 20:19:12 2015 +0800

fs: aufs: fix a build error for archs which doesn't support
MUTEX_SPIN_ON_OWNER

For struct mutex, the member "owner" only exist when either DEBUG_MUTEXES or MUTEX_SPIN_ON_OWNER is enabled. The SMP is a necessary condition, but not a sufficiency condition for MUTEX_SPIN_ON_OWNER. So we would get build error on arch such as mpis due to SMP is enabled and both DEBUG_MUTEXES and MUTEX_SPIN_ON_OWNER are disabled. Replace the SMP with MUTEX_SPIN_ON_OWNER to fix it.

:100644 100644 f0edd021102b... 268a8a54ebfc... M fs/aufs/i_op.c

---------

And it is on the edgerouter branch.

So either the fix isn't complete, or we are building a different config here, or the revs are wrong.

... and indeed, that isn't part of the patch Kevin sent, so you are building and old SRCREV.

I'll send a follow up patch shortly.

Bruce

Quoted 2 lines

Ross