Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH Applied Bruce Ashfield 2 participants 6 messages Jul 3, 2012 – Jul 5, 2012

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here's a collection of updates and fixes from the past week. Built and boot tested here.

There's only one that may be slightly interesting, that's my addition of the qemumipsel as a machine mapping. You may or may not want this change, but the kernel meta data change was trivial and should have been done a while ago, so that part I'll keep even if you don't want the branch mapping.

The routine updates are:

- configuration audit updates
- 3.4.4 -stable update
- -rt refresh to 3.4.4-rt-13

I also fixed linux-yocto-tiny to have kernel configuration audit reports again, there was a missing KMETA mapping in the recipe. There's some output from the audit that we need to look into, but that will be dealt with separately.

I've built and booted this on every qemu target I could get my hands on .. but the matrix is increasing with multiple variants, kernel versions and recipes :)

cc Darren Hart <[email protected]>

Cheers,

Bruce

The following changes since commit 644ad4bf1e30fcee4b9d5abb819046d1f2193d27:

documentation/bsp-guide/bsp.xml: Yocto term paring (2012-07-02 16:47:45 +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 (4):
linux-yocto/3.4: add qemumipsel machine mapping linux-yocto/3.4: v3.4.4 + configuration updates linux-yocto/3.4: update preempt-rt to 3.4.4-rt13
linux-yocto-tiny: add KMETA specification

 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    2 ++
 meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   17 +++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/4 linux-yocto/3.4: add qemumipsel machine mapping

Updating the meta branch with a board description and configuration that can be found from the linux-yocto recipes without doing a MACHINE -> KMACHINE mapping.

From the meta branch commit:

The mti malta board description for a little endian config can't be found by default unless it has a matching KMACHINE, or the KMACHINE is set in a kernel recipe. In this case, it is easier to just add qemumipsel in the KMACHINE list, so the recipe doesn't need to do the mapping.

The little endian mips support reuses everything but the endianess settings from the big endian mti malta board emulation.

This change adds the required mappings and SRCREVs, but does not update the machine compatibilty, since official support is still pending. The compatibility can be set in addon layers until that time.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +1 -1
index fde9020..4afcf65 100644
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "4a688295a1c6d44f3eea409d51a0344c8830d829"
 SRCREV_machine_qemuppc ?= "83843542dd524007547eddba507690cd4bab393b"
-SRCREV_meta ?= "d65afd9e42230a3ef4cc1f9ad62d0aa84a533cd0"
+SRCREV_meta ?= "51f94f06fe908a910564687942fdd82809f82348"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.4.bb +3 -1
index 0247d24..892f058 100644
@@ -5,17 +5,19 @@ KBRANCH_qemux86  = "standard/common-pc/base"
 KBRANCH_qemux86-64  = "standard/common-pc-64/base"
 KBRANCH_qemuppc  = "standard/qemuppc"
 KBRANCH_qemumips = "standard/mti-malta32"
+KBRANCH_qemumipsel = "standard/mti-malta32"
 KBRANCH_qemumips64 = "standard/mti-malta64"
 KBRANCH_qemumips64el = "standard/mti-malta64"
 KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
 
 SRCREV_machine_qemuarm ?= "4e354f7fa345464f284525a27eb1544cbc60968d"
 SRCREV_machine_qemumips  ?= "c65bc98cd501459bb6ffc7b5ec5a7e72c41dceef"
+SRCREV_machine_qemumipsel ?= "c65bc98cd501459bb6ffc7b5ec5a7e72c41dceef"
 SRCREV_machine_qemuppc ?= "ee3475b4ca8c9e26f55f6e107101d832e7dec7ac"
 SRCREV_machine_qemux86 ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
 SRCREV_machine_qemux86-64 ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
 SRCREV_machine ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
-SRCREV_meta ?= "d65afd9e42230a3ef4cc1f9ad62d0aa84a533cd0"
+SRCREV_meta ?= "51f94f06fe908a910564687942fdd82809f82348"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/4 linux-yocto/3.4: v3.4.4 + configuration updates

In reply to Bruce Ashfield

Bumping the kernel version to v3.4.4 and importing the following meta branch commits:

9b7c74b meta: bump kver to v3.4.4
8231dec ck: relocate config post patches 26b965e net_sched: remove dupicate configuration option df8bf19 meta: remove non applying routerstationpro patch 292d8ea arm: import upstream versatile io.h fix f4824b1 net_sched: select ACT as a dependency of INGRESS 30ae722 cgroups: delete obsolete namespace option 51f94f0 meta: add qemumipsel mapping

Built and boot tested on qemu*

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto_3.4.bb    |   17 ++++++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +4 -4
index 4afcf65..f856837 100644
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
 
-LINUX_VERSION ?= "3.4.3"
+LINUX_VERSION ?= "3.4.4"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "4a688295a1c6d44f3eea409d51a0344c8830d829"
-SRCREV_machine_qemuppc ?= "83843542dd524007547eddba507690cd4bab393b"
-SRCREV_meta ?= "51f94f06fe908a910564687942fdd82809f82348"
+SRCREV_machine ?= "e24c02204c70e9280115d6512eb54c884dee5fa7"
+SRCREV_machine_qemuppc ?= "b610e46c0ae57e483449c08619d92b8531e75ef5"
+SRCREV_meta ?= "9b7c74bc8e205edb403744098b9d62690c25803e"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.4.bb +8 -9
index 892f058..b21c15d 100644
@@ -10,18 +10,17 @@ KBRANCH_qemumips64 = "standard/mti-malta64"
 KBRANCH_qemumips64el = "standard/mti-malta64"
 KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
 
-SRCREV_machine_qemuarm ?= "4e354f7fa345464f284525a27eb1544cbc60968d"
-SRCREV_machine_qemumips  ?= "c65bc98cd501459bb6ffc7b5ec5a7e72c41dceef"
-SRCREV_machine_qemumipsel ?= "c65bc98cd501459bb6ffc7b5ec5a7e72c41dceef"
-SRCREV_machine_qemuppc ?= "ee3475b4ca8c9e26f55f6e107101d832e7dec7ac"
-SRCREV_machine_qemux86 ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
-SRCREV_machine_qemux86-64 ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
-SRCREV_machine ?= "a1cdb60720c452c3965eaec3ec2cd10f06261cc5"
-SRCREV_meta ?= "51f94f06fe908a910564687942fdd82809f82348"
+SRCREV_machine_qemuarm ?= "168ed084c978a39eabf0071f0049b623bc05c856"
+SRCREV_machine_qemumips  ?= "66dbebd43d65eb070e0afa25f63f6b69ddd47c65"
+SRCREV_machine_qemuppc ?= "bc74ca65c9cae025861455d7f0a259458cd4a829"
+SRCREV_machine_qemux86 ?= "d345461f0d52d1a82553c2edd845a8bee908923f"
+SRCREV_machine_qemux86-64 ?= "d345461f0d52d1a82553c2edd845a8bee908923f"
+SRCREV_machine ?= "d345461f0d52d1a82553c2edd845a8bee908923f"
+SRCREV_meta ?= "9b7c74bc8e205edb403744098b9d62690c25803e"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
-LINUX_VERSION ?= "3.4.3"
+LINUX_VERSION ?= "3.4.4"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/4 linux-yocto/3.4: update preempt-rt to 3.4.4-rt13

In reply to Bruce Ashfield

Updating preempt-rt in the 3.4 kernel to the latest upstream version 3.4.4-rt13.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |    6 +++---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb    |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +3 -3
index f856837..44d944f 100644
@@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "e24c02204c70e9280115d6512eb54c884dee5fa7"
-SRCREV_machine_qemuppc ?= "b610e46c0ae57e483449c08619d92b8531e75ef5"
-SRCREV_meta ?= "9b7c74bc8e205edb403744098b9d62690c25803e"
+SRCREV_machine ?= "684f3c1886618c919b54e8b362e72da3d128c532"
+SRCREV_machine_qemuppc ?= "fb15c26f9deae3912ca7e2aaf8c818127ef27d82"
+SRCREV_meta ?= "62cdf67899a36efeab3ac20dcb27f1ebc238d3af"
 
 PR = "${INC_PR}.0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.4.bb +1 -1
index b21c15d..fe6f6cd 100644
@@ -16,7 +16,7 @@ SRCREV_machine_qemuppc ?= "bc74ca65c9cae025861455d7f0a259458cd4a829"
 SRCREV_machine_qemux86 ?= "d345461f0d52d1a82553c2edd845a8bee908923f"
 SRCREV_machine_qemux86-64 ?= "d345461f0d52d1a82553c2edd845a8bee908923f"
 SRCREV_machine ?= "d345461f0d52d1a82553c2edd845a8bee908923f"
-SRCREV_meta ?= "9b7c74bc8e205edb403744098b9d62690c25803e"
+SRCREV_meta ?= "62cdf67899a36efeab3ac20dcb27f1ebc238d3af"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
Signature · 1 line
1.7.5.4
author
#4 lore raw

PATCH 4/4 linux-yocto-tiny: add KMETA specification

In reply to Bruce Ashfield

With recent kern tools changes, having a meta branch is opt-in. The other linux-yocto recipes were updated, but linux-yocto-tiny was missed.

Without specifying a meta branch, the kernel configuration audit won't return any useful results, and throws a warning message.

WARNING: Can't find any BSP hardware or required configuration fragments.
WARNING: Looked at //cfg///hdw_frags.txt and //cfg///required_frags.txt in directory: //cfg//
NOTE: package linux-yocto-tiny-3.2.18+git1+ee78519365bdb25287703bbc31c06b193263c654_1+27b68a93eb791e830da8d3a2c0fc99780897ad89-r3.0: task do_kernel

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +2 -0
index 78337fb..5381770 100644
@@ -9,6 +9,8 @@ KCONFIG_MODE = "--allnoconfig"
 
 LINUX_VERSION ?= "3.2.18"
 
+KMETA = "meta"
+
 SRCREV_machine ?= "27b68a93eb791e830da8d3a2c0fc99780897ad89"
 SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654"
Signature · 1 line
1.7.5.4
Applied
#5 lore raw
In reply to Bruce Ashfield
Quoted 46 lines · Bruce Ashfield

Richard/Saul,

Here's a collection of updates and fixes from the past week. Built and boot tested here.

There's only one that may be slightly interesting, that's my addition of the qemumipsel as a machine mapping. You may or may not want this change, but the kernel meta data change was trivial and should have been done a while ago, so that part I'll keep even if you don't want the branch mapping.

The routine updates are:

- configuration audit updates
- 3.4.4 -stable update
- -rt refresh to 3.4.4-rt-13

I also fixed linux-yocto-tiny to have kernel configuration audit reports again, there was a missing KMETA mapping in the recipe. There's some output from the audit that we need to look into, but that will be dealt with separately.

I've built and booted this on every qemu target I could get my hands on .. but the matrix is increasing with multiple variants, kernel versions and recipes :)

cc Darren Hart <[email protected]>

Cheers,

Bruce

The following changes since commit 644ad4bf1e30fcee4b9d5abb819046d1f2193d27:

   documentation/bsp-guide/bsp.xml: Yocto term paring (2012-07-02 16:47:45 +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 (4):
linux-yocto/3.4: add qemumipsel machine mapping linux-yocto/3.4: v3.4.4 + configuration updates linux-yocto/3.4: update preempt-rt to 3.4.4-rt13
linux-yocto-tiny: add KMETA specification

Quoted 5 lines
  meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb   |    8 ++++----
  meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    2 ++
  meta/recipes-kernel/linux/linux-yocto_3.4.bb      |   17 +++++++++--------
  3 files changed, 15 insertions(+), 12 deletions(-)

Merged into OE-Core

Thanks
Sau!