Skip to contentSkip to conversation

linux-yocto: consolidated pull

PATCH Applied Bruce Ashfield 2 participants 6 messages Mar 16, 2012 – Mar 19, 2012

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull

Richard/Saul,

Here's the consolidated pull request that I mentioned earlier in the week. Two -stable updates and some changes for BSP configuration.

Tested on all the qemu* targets. No issues found here.

There are also some emenlow changes in the tree, but those will be picked up by other layers.

cc Tom Zanussi <[email protected]>

Cheers,

Bruce

The following changes since commit be0f9dd483af2a2f55b2ae8ef9ca172e7c90819c:

python-imaging: bring in fixes from meta-oe (2012-03-16 10:57:09 +0000)

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 (4):
linux-yocto/3.0: update meta SRCREV
linux-yocto/3.2: update fri2 configuration
linux-yocto/3.2: update to v3.2.11
linux-yocto/3.0: update to v3.0.24

 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb      |   18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |   18 +++++++++---------
 5 files changed, 29 insertions(+), 29 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/4 linux-yocto/3.0: update meta SRCREV

Bumping the meta branch for two changes:

cac43c1 fri2: Update fri2.cfg for hardware specific support 892bd13 meta: Create scc file for pvr merge

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1
index e944416..a9a921d 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "49d1d57f98a9ac378a1f12f5d23301c11495a5df"
 SRCREV_machine_qemuppc ?= "7b3162e269c49c6a4653d43292c62c188add8d67"
-SRCREV_meta ?= "e559129b4a6f39f68b75141096b2d516cf7a7f35"
+SRCREV_meta ?= "cac43c16d4c0cbbb857c9c110195208629975b06"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb +1 -1
index a3a6167..b67ddee 100644
@@ -11,7 +11,7 @@ KBRANCH = "${KMACHINE}"
 LINUX_VERSION ?= "3.0.23"
 
 SRCREV_machine ?= "8fd24b3570ab995848e4123ef13bac64e2c924be"
-SRCREV_meta ?= "e559129b4a6f39f68b75141096b2d516cf7a7f35"
+SRCREV_meta ?= "cac43c16d4c0cbbb857c9c110195208629975b06"
 
 PR = "r3"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index d76bac8..cb4ded2 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "16f1ebf66ce2b58cbfc0ff7c8883c91c883e216a"
 SRCREV_machine_qemux86 ?= "bc2cb6560d3dedf8337b5df8228a6e8002b6a98c"
 SRCREV_machine_qemux86-64 ?= "b9cbe895ce0c259b4684355ea1602402b2653ca5"
 SRCREV_machine ?= "8fd24b3570ab995848e4123ef13bac64e2c924be"
-SRCREV_meta ?= "e559129b4a6f39f68b75141096b2d516cf7a7f35"
+SRCREV_meta ?= "cac43c16d4c0cbbb857c9c110195208629975b06"
 
 PR = "r4"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/4 linux-yocto/3.2: update fri2 configuration

In reply to Bruce Ashfield

Bumping the meta SRCREV to pickup the following change

fri2: Update fri2.cfg for hardware specific support

The FRI2 does not require R8169 or PATA support. It does not need SFF or GENERIC ATA options either.

The FRI2 does require IEEE802154 (Zigbee), BT (Bluetooth), and IWLWIFI. The latter is compiled as a module to avoid the need for an initrd containing the firmware blobs.

Signed-off-by Darren Hart <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 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 24a885f..85e2f56 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "ae15fb7aaba7d12c48e1a1d30e5b8857d40b9b10"
 SRCREV_machine_qemuppc ?= "963f79376e583ff79c55fd275b79bfc9a3aedd8e"
-SRCREV_meta ?= "8295227f068f78ec3c433529e4012a38773a88c9"
+SRCREV_meta ?= "42fff722188e0de7246a3a6900eeeeaf69f87047"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -1
index fdfde8a..c98937f 100644
@@ -23,7 +23,7 @@ SRCREV_machine_qemuppc ?= "74364f1062a219eb242d7cb300a404516c297601"
 SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07"
 SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7"
 SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba"
-SRCREV_meta ?= "8295227f068f78ec3c433529e4012a38773a88c9"
+SRCREV_meta ?= "42fff722188e0de7246a3a6900eeeeaf69f87047"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/4 linux-yocto/3.2: update to v3.2.11

In reply to Bruce Ashfield

Updating the 3.2 meta and board branches to the latest 3.2-stable update.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto_3.2.bb    |   18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +4 -4
index 85e2f56..f31baeb 100644
@@ -11,12 +11,12 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.2.9"
+LINUX_VERSION ?= "3.2.11"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "ae15fb7aaba7d12c48e1a1d30e5b8857d40b9b10"
-SRCREV_machine_qemuppc ?= "963f79376e583ff79c55fd275b79bfc9a3aedd8e"
-SRCREV_meta ?= "42fff722188e0de7246a3a6900eeeeaf69f87047"
+SRCREV_machine ?= "32ecb53e9ff759bbd297a10712b62a6575daaf86"
+SRCREV_machine_qemuppc ?= "0d5625bb868cc2471d5dd49eb7abe7eb5fe1044b"
+SRCREV_meta ?= "514847185c78c07f52e02750fbe0a03ca3a31d8f"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.2.bb +9 -9
index c98937f..94423b6 100644
@@ -15,15 +15,15 @@ KBRANCH_qemuppc  = "standard/default/qemu-ppc32"
 KBRANCH_qemumips = "standard/default/mti-malta32-be"
 KBRANCH_qemuarm  = "standard/default/arm-versatile-926ejs"
 
-LINUX_VERSION ?= "3.2.9"
-
-SRCREV_machine_qemuarm ?= "a4d4d3dd9a69611bd1915626d1f2e9f2b1571b39"
-SRCREV_machine_qemumips ?= "79a0a4c9872ebc70af688f9b09f6be4e4d2249e0"
-SRCREV_machine_qemuppc ?= "74364f1062a219eb242d7cb300a404516c297601"
-SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07"
-SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7"
-SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba"
-SRCREV_meta ?= "42fff722188e0de7246a3a6900eeeeaf69f87047"
+LINUX_VERSION ?= "3.2.11"
+
+SRCREV_machine_qemuarm ?= "dfbba772cbee84125ac1558c904a7dc181445f5f"
+SRCREV_machine_qemumips ?= "0e0c67635b74199d534f75500e5c1654a1219bc6"
+SRCREV_machine_qemuppc ?= "92de4e2f3c6b397c8b363e079cc4d5e9bcadf877"
+SRCREV_machine_qemux86 ?= "8ada1bb97415fe959a57a08504be4eb8a656ed30"
+SRCREV_machine_qemux86-64 ?= "4ca7e2c5d42e755e1b4c3e1478128f047a8ed2a8"
+SRCREV_machine ?= "01e948c2bdf7f5ad9f2b30047a8d3493a1a2880a"
+SRCREV_meta ?= "514847185c78c07f52e02750fbe0a03ca3a31d8f"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.5.4
author
#4 lore raw

PATCH 4/4 linux-yocto/3.0: update to v3.0.24

In reply to Bruce Ashfield

Updating the meta and machine branches to the latest 3.0 -stable release.

To see the full changelog: git log v3.0.23..v3.0.24

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb      |   18 +++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +4 -4
index a9a921d..d8644b7 100644
@@ -11,12 +11,12 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "yocto/standard/preempt-rt/base"
 KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.0.23"
+LINUX_VERSION ?= "3.0.24"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "49d1d57f98a9ac378a1f12f5d23301c11495a5df"
-SRCREV_machine_qemuppc ?= "7b3162e269c49c6a4653d43292c62c188add8d67"
-SRCREV_meta ?= "cac43c16d4c0cbbb857c9c110195208629975b06"
+SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27"
+SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416"
+SRCREV_meta ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb +3 -3
index b67ddee..e8bd633 100644
@@ -8,10 +8,10 @@ DEPENDS += "xz-native"
 KMACHINE = "yocto/standard/base"
 KBRANCH = "${KMACHINE}"
 
-LINUX_VERSION ?= "3.0.23"
+LINUX_VERSION ?= "3.0.24"
 
-SRCREV_machine ?= "8fd24b3570ab995848e4123ef13bac64e2c924be"
-SRCREV_meta ?= "cac43c16d4c0cbbb857c9c110195208629975b06"
+SRCREV_machine ?= "da7c40006b08916ff3a3db104def82aaf9ac2716"
+SRCREV_meta ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
 
 PR = "r3"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +9 -9
index cb4ded2..e56e1d7 100644
@@ -10,15 +10,15 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
 KBRANCH = "${KMACHINE}"
 
-LINUX_VERSION ?= "3.0.23"
-
-SRCREV_machine_qemuarm ?= "927c56dcc7dc9199923a86cc0dac741b6b080953"
-SRCREV_machine_qemumips ?= "b1f7eb611a30a46692c11ea1164d17f0d44e911b"
-SRCREV_machine_qemuppc ?= "16f1ebf66ce2b58cbfc0ff7c8883c91c883e216a"
-SRCREV_machine_qemux86 ?= "bc2cb6560d3dedf8337b5df8228a6e8002b6a98c"
-SRCREV_machine_qemux86-64 ?= "b9cbe895ce0c259b4684355ea1602402b2653ca5"
-SRCREV_machine ?= "8fd24b3570ab995848e4123ef13bac64e2c924be"
-SRCREV_meta ?= "cac43c16d4c0cbbb857c9c110195208629975b06"
+LINUX_VERSION ?= "3.0.24"
+
+SRCREV_machine_qemuarm ?= "62bbe1d7a0e5c1200a99dabca889a52c9417b96b"
+SRCREV_machine_qemumips ?= "66de88919f24f1e590a48dae6de752a68fed2353"
+SRCREV_machine_qemuppc ?= "7528f1d06ef5665eed8c1498f62d5403b82bbbd6"
+SRCREV_machine_qemux86 ?= "f153b0eb8264dc1e69f59d4c9173619feb4d5bd9"
+SRCREV_machine_qemux86-64 ?= "aac580659dc0ce083f250fb05abf82e58d7f4531"
+SRCREV_machine ?= "da7c40006b08916ff3a3db104def82aaf9ac2716"
+SRCREV_meta ?= "a4ac64fe873f08ef718e2849b88914725dc99c1c"
 
 PR = "r4"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.5.4
Applied
#5 lore raw
In reply to Bruce Ashfield
Quoted 31 lines · Bruce Ashfield

Richard/Saul,

Here's the consolidated pull request that I mentioned earlier in the week. Two -stable updates and some changes for BSP configuration.

Tested on all the qemu* targets. No issues found here.

There are also some emenlow changes in the tree, but those will be picked up by other layers.

cc Tom Zanussi<[email protected]>

Cheers,

Bruce

The following changes since commit be0f9dd483af2a2f55b2ae8ef9ca172e7c90819c:

   python-imaging: bring in fixes from meta-oe (2012-03-16 10:57:09 +0000)

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 (4):
linux-yocto/3.0: update meta SRCREV
linux-yocto/3.2: update fri2 configuration
linux-yocto/3.2: update to v3.2.11
linux-yocto/3.0: update to v3.0.24

Quoted 7 lines
  meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    8 ++++----
  meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    8 ++++----
  meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb |    6 +++---
  meta/recipes-kernel/linux/linux-yocto_3.0.bb      |   18 +++++++++---------
  meta/recipes-kernel/linux/linux-yocto_3.2.bb      |   18 +++++++++---------
  5 files changed, 29 insertions(+), 29 deletions(-)

Merged into OE-Core

Thanks
Sau!