Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH Applied Bruce Ashfield 2 participants 5 messages Aug 15, 2011 – Aug 22, 2011

lore
Share & tools
lore
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

We've had some good mileage on the 3.0.x kernel. I've been building and booting these boards for weeks now and the meta-intel based BSPs have all been switching over and all of Darren's -rt work was done on top of 3.0.

So the big part of this pull request is the removal of the explicit version preference to 2.6.37. We still have the old versions(s) as fallbacks, but it does seem to be time to acknowledge that 3.0.x should be the default kernel.

As for the timing of the merge, I'll leave this up to you.

The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd:

Fixup remaining bb.msg.domain users (2011-08-15 17:31:52 +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 (3):
linux-yocto: bump version string to 3.0.1
qemu: change default kernel to 3.0.x
linux-yocto: meta SRCREV bump

 meta/conf/machine/include/qemu.inc           |    1 -
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/3 linux-yocto: bump version string to 3.0.1

There was some confusion around the 3.0 version string in the linux-yocto recipe when the merged version was 3.0.1. Bumping the version string should clarify what version will be fetched.

---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.0.bb +2 -2
index ba352e2..132ee0f 100644
@@ -11,7 +11,7 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 KBRANCH = ${KMACHINE}
 KMETA = meta
 
-LINUX_VERSION ?= "3.0"
+LINUX_VERSION ?= "3.0.1"
 LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
 
 SRCREV_machine_qemuarm = "36b4cdddcafc711f0ec9ad97882f23a6443c61b2"
@@ -22,7 +22,7 @@ SRCREV_machine_qemux86-64 = "d0b814813bce09971c5cbb0d22bacb8842146fa0"
 SRCREV_machine = "ad13129a87957656c18584793abcee51de0e196a"
 SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
 
-PR = "r0"
+PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 SRCREV_FORMAT = "meta_machine"
 
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 2/3 qemu: change default kernel to 3.0.x

In reply to Bruce Ashfield

The explicit setting of version preference to 2.6.37 is no longer required. All of the qemu targets have been built and boot tested on 3.0.1 for core-image-minimal and core-image-sato and are safe for wider build/boot testing.

---
 meta/conf/machine/include/qemu.inc |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta/conf/machine/include/qemu.inc +0 -1
index 4cab6f3..9ef242f 100644
@@ -12,7 +12,6 @@ RDEPENDS_kernel-base = ""
 
 # Use a common kernel recipe for all QEMU machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "2.6.37+git%"
 #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 
 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
Signature · 1 line
1.7.4.1
#3 lore raw

PATCH 3/3 linux-yocto: meta SRCREV bump

In reply to Bruce Ashfield

Bumping the linux-yocto meta SRCREV to pickup new target configurations and features.

---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index 132ee0f..44f1ebe 100644
@@ -20,7 +20,7 @@ SRCREV_machine_qemuppc = "c0f5dd4ef37b445d8ac73b11dd93e0ffdb7e9f6d"
 SRCREV_machine_qemux86 = "c29beadfd4364aca9358ac0fdb8356c1dbbdacb2"
 SRCREV_machine_qemux86-64 = "d0b814813bce09971c5cbb0d22bacb8842146fa0"
 SRCREV_machine = "ad13129a87957656c18584793abcee51de0e196a"
-SRCREV_meta = "7782fc673afd6a1c742409896ae787560d96fce8"
+SRCREV_meta = "9da70812ecddee0f7eeb11675f29497cb997275e"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.4.1
Applied
#4 lore raw
In reply to Bruce Ashfield
Quoted 22 lines · Bruce Ashfield

Richard/Saul,

We've had some good mileage on the 3.0.x kernel. I've been building and booting these boards for weeks now and the meta-intel based BSPs have all been switching over and all of Darren's -rt work was done on top of 3.0.

So the big part of this pull request is the removal of the explicit version preference to 2.6.37. We still have the old versions(s) as fallbacks, but it does seem to be time to acknowledge that 3.0.x should be the default kernel.

As for the timing of the merge, I'll leave this up to you.

The following changes since commit a21ff559e7c93e9da61104f4a33e42e6004189fd:

   Fixup remaining bb.msg.domain users (2011-08-15 17:31:52 +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

Quoted 9 lines

Bruce Ashfield (3):
linux-yocto: bump version string to 3.0.1
qemu: change default kernel to 3.0.x
linux-yocto: meta SRCREV bump

  meta/conf/machine/include/qemu.inc           |    1 -
  meta/recipes-kernel/linux/linux-yocto_3.0.bb |    6 +++---
  2 files changed, 3 insertions(+), 4 deletions(-)

Merged into OE-Core

Thanks
Sau!