Skip to contentSkip to conversation

linux-yocto/3.2: minor -rt increment and fixes

PATCH Applied Bruce Ashfield 2 participants 4 messages Mar 6, 2012 – Mar 13, 2012

lore
Share & tools
lore
#0 lore raw

cover linux-yocto/3.2: minor -rt increment and fixes

Richard/Saul,

This is another kernel SRCREV update that should be stacked on the end of my other pending patches. I've kept everything separate so we can track the incremental changes.

This one is a minor update to the 3.2 tree.

- there were a few config files that moved between 3.0 and 3.2 and I'm adjusting the BSPs to match
- 3.2.9-rt16 came out with a fix we want, so I've bumped the 3.2 rt BSPs to pick it up.

cc Darren Hart <[email protected]>

Cheers,

Bruce

The following changes since commit 3e07ca64df8b16348520fa72d88f0ef54b5fee77:

linux-yocto/meta-yocto: v3.2.9, v3.0.23 + fixes and updates (2012-03-06 10:18:11 -0500)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel-3.2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-3.2

Bruce Ashfield (2):
linux-yocto/meta: fix incorrect config references linux-yocto/rt: udpate SRCREVs to 3.2.9-rt16

 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.2.bb    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/2 linux-yocto/meta: fix incorrect config references

Updating the meta SRCREV to pickup the following fixes:

a9ffedb meta/fri2/sys940x: fix incorrect cfg includes 3d1a678 meta/sys940x: fix incorrect emgd branch merge

During the merge of the 3.0 BSPs forward to 3.2, a few moved config fragments were missed.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.2.bb    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +1 -1
index efb1bc9..872289f 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "3652b606f1ab7769a7ecc86c70d22db4ef99fb2a"
 SRCREV_machine_qemuppc ?= "0c8f5214bc15699b41369751cdecea45f717c79c"
-SRCREV_meta ?= "fa83c7b0b47d1aa3e25594ddbcd125a1108d3aaa"
+SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -1
index 2d2542a..6da16c6 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "74364f1062a219eb242d7cb300a404516c297601"
 SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07"
 SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7"
 SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba"
-SRCREV_meta ?= "fa83c7b0b47d1aa3e25594ddbcd125a1108d3aaa"
+SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 2/2 linux-yocto/rt: udpate SRCREVs to 3.2.9-rt16

In reply to Bruce Ashfield

Bumping the -rt kernel to pickup the incremental update to -rt16. No major changes from -rt15, except for a bug fix that we want to pick up.

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.2.bb    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +3 -3
index 872289f..24a885f 100644
@@ -14,9 +14,9 @@ KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
 LINUX_VERSION ?= "3.2.9"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "3652b606f1ab7769a7ecc86c70d22db4ef99fb2a"
-SRCREV_machine_qemuppc ?= "0c8f5214bc15699b41369751cdecea45f717c79c"
-SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0"
+SRCREV_machine ?= "ae15fb7aaba7d12c48e1a1d30e5b8857d40b9b10"
+SRCREV_machine_qemuppc ?= "963f79376e583ff79c55fd275b79bfc9a3aedd8e"
+SRCREV_meta ?= "8295227f068f78ec3c433529e4012a38773a88c9"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -1
index 6da16c6..fdfde8a 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "74364f1062a219eb242d7cb300a404516c297601"
 SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07"
 SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7"
 SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba"
-SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0"
+SRCREV_meta ?= "8295227f068f78ec3c433529e4012a38773a88c9"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.4.1
Applied
#3 lore raw
In reply to Bruce Ashfield
Quoted 27 lines · Bruce Ashfield

Richard/Saul,

This is another kernel SRCREV update that should be stacked on the end of my other pending patches. I've kept everything separate so we can track the incremental changes.

This one is a minor update to the 3.2 tree.

- there were a few config files that moved between 3.0 and 3.2 and I'm adjusting the BSPs to match
- 3.2.9-rt16 came out with a fix we want, so I've bumped the 3.2 rt BSPs to pick it up.

cc Darren Hart<[email protected]>

Cheers,

Bruce

The following changes since commit 3e07ca64df8b16348520fa72d88f0ef54b5fee77:

   linux-yocto/meta-yocto: v3.2.9, v3.0.23 + fixes and updates (2012-03-06 10:18:11 -0500)

are available in the git repository at:

   git://git.pokylinux.org/poky-contrib zedd/kernel-3.2
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-3.2
Quoted 8 lines

Bruce Ashfield (2):
linux-yocto/meta: fix incorrect config references linux-yocto/rt: udpate SRCREVs to 3.2.9-rt16

  meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |    6 +++---
  meta/recipes-kernel/linux/linux-yocto_3.2.bb    |    2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)

Merged into OE-Core

Thanks
Sau!