linux-yocto: consolidated pull request

PATCH Applied Bruce Ashfield 2 participants 11 messages Jun 7, 2012 – Jun 8, 2012

lore

Share & tools

lore

Bruce Ashfield

author

2012-06-07 20:10 UTC #0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Here's a 9 patch series that is a collection of work that's been brewing for about three weeks.

Highlights include:

- removal of the 2.6.37 recipe, it's time is now gone
- addition of the 3.4 kernel recipe
- configuration fixups and audits within that 3.4 kernel
- kernel *only* support for mips64 mti emulation
- -stable updates for supported kernels 3.2.18, 3.0.32
- machine fixes/configurations for the 3.2 and 3.0 kernels
- kern tool updates, streamlining and fixes

I've built and booted the qemu* machines on 3.4, and have been doing this for several weeks now. Built and boot tests have also happened on the 3.0 and 3.2 trees as well. Some BSP layers are already using these changes.

The tools changes set the stage for some follow on changes that I'm nearly done for the next oe-core/yocto release, but they are useful by themselves, so I'm getting them out of my queue.

I'll follow up to other lists with updates to recipes and configs that reference the modified kernels.

BSP layers can be updated as appropriate, since all these changes have been pushed to the various kernel trees.

Cheers,

Bruce

The following changes since commit df8f55a919b3cc602ce1f1c51630c7edf6e36b55:

ltp: Add patch to correct failing build (2012-06-05 23:05:00 +0100)

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

Bruce Ashfield (9):
kern-tools: remove unused code, meta branch and directory assumptions linux-yocto/3.2: update to v3.2.18
linux-yocto/3.0: update to v3.0.32
linux-yocto: remove v2.6.37 recipe
linux-yocto: add machine aliases for yocto BSPs
linux-yocto: add 3.4 recipe
linux-yocto/3.2: fri2 and chiefriver machine updates linux-yocto/3.0: add cedartrail kernel features
kern-tools: anchor KMACHINE test

 .../kern-tools/kern-tools-native_git.bb            |    4 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |   15 ++------
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb    |   15 ++------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb  |    7 ++--
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb    |   38 --------------------
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   23 ++++--------
 meta/recipes-kernel/linux/linux-yocto_3.2.bb       |   23 ++++--------
 meta/recipes-kernel/linux/linux-yocto_3.4.bb       |   38 ++++++++++++++++++++
 8 files changed, 67 insertions(+), 96 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
 create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.4.bb

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #1 lore raw

PATCH 1/9 kern-tools: remove unused code, meta branch and directory assumptions

Updating the kern-tools SRCREV to pick up fixes that remove unused code, transition code (tree format changes) and to remove assumptions about branch and directory naming.

There are no user visible changes with this update, but the plumbing changes will be used in future updates for more generalized support.

The commit details are below:

Author: Bruce Ashfield <[email protected]>
Date: Fri May 11 12:13:12 2012 -0400

kgit-publish: remove --remote option

The ability to publish and automatically push a repository was never used, and is error prone. The complexit isn't needed in the script, so removing it is the best option.

An explicit push after tree publication is suggested, or a wrapper script (specific to a particular infrastructure) around this script.

Signed-off-by Bruce Ashfield <[email protected]>

Author: Bruce Ashfield <[email protected]>
Date: Fri May 11 12:04:09 2012 -0400

kern-tools: remove unused code, scripts and transition code

The period of supporting old trees with a different meta branch name and directory structure are gone. So the cleanup and removal of the old structure can be completed.

The meta branch and directory are now controlled via command line, or via the KMETA environment variable. No testing and conditional processing of the tree are required.

Additionally, the generate_cfg script is no longer used, or is the branch conditing code in createme. So they can be safely removed from the tools and repository.

Signed-off-by Bruce Ashfield <[email protected]>

Author: Bruce Ashfield <[email protected]>
Date: Thu May 10 12:18:19 2012 -0400

kern-tools: remove meta tag and directory assumptions

During repository sanity checks (createme) and during the checkpoint process, there were several assumptions about the tree that either relied on a tag, or a particular directory name.

With this set of changes, simply passing the meta branch name is enough to sanitize and restore the checkpoint. If no meta branch name is passed, the default of 'meta' is used for both the branch and meta data directory name.

Signed-off-by Bruce Ashfield <[email protected]>

---
 .../kern-tools/kern-tools-native_git.bb            |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +2 -2

index 9ef1a20..becb0de 100644
@@ -1,10 +1,10 @@
 DESCRIPTION = "Scripts and utilities for managing Yocto branched kernels."
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d843f43d2e22b0d91a6fee"
+LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70cd5f52972f8884b80743d"
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "de3649840e8e3ca25bc79d2444f04a1b158a1769"
+SRCREV = "0859d2f73cc6f6973835fa5713b5a98a43ed43ff"
 PR = "r12"
 PV = "0.1+git${SRCPV}"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #2 lore raw

PATCH 2/9 linux-yocto/3.2: update to v3.2.18

In reply to Bruce Ashfield

Updating the 3.2 kernel SRCREVs to pickup the -stable update to v3.2.18.

Signed-off-by Bruce Ashfield <[email protected]>

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

meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +3 -3

index b275ad4..f881c1f 100644
@@ -11,13 +11,13 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.2.11"
+LINUX_VERSION ?= "3.2.18"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7"
-SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c"
+SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087"
+SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f"
 SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r1"

meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +2 -2

index f50e12e..80be112 100644
@@ -9,9 +9,9 @@ KBRANCH = "standard/tiny"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"
 
-LINUX_VERSION ?= "3.2.11"
+LINUX_VERSION ?= "3.2.18"
 
-SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246"
+SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
 SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r0"

meta/recipes-kernel/linux/linux-yocto_3.2.bb +8 -8

index 14de6f4..665ddca 100644
@@ -15,14 +15,14 @@ KBRANCH_qemuppc  = "standard/default/qemu-ppc32"
 KBRANCH_qemumips = "standard/default/mti-malta32-be"
 KBRANCH_qemuarm  = "standard/default/arm-versatile-926ejs"
 
-LINUX_VERSION ?= "3.2.11"
-
-SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e"
-SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b"
-SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec"
-SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1"
-SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727"
-SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d"
+LINUX_VERSION ?= "3.2.18"
+
+SRCREV_machine_qemuarm ?= "259cff0813417d16baaaaf44b00a9f75103ebfcb"
+SRCREV_machine_qemumips ?= "9a803ecc05b3af481036a6d9bb0da3a899be3074"
+SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162"
+SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48"
+SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c"
+SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
 SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
 
 PR = "r1"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #3 lore raw

PATCH 3/9 linux-yocto/3.0: update to v3.0.32

In reply to Bruce Ashfield

Updating the 3.0 kernel SRCREVs to integrate the v3.0.32 -stable release.

Signed-off-by Bruce Ashfield <[email protected]>

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

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +3 -3

index 14af91d..929aa85 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.24"
+LINUX_VERSION ?= "3.0.32"
 LINUX_KERNEL_TYPE = "preempt-rt"
 KMETA = "meta"
 
-SRCREV_machine ?= "cf280f1dc5877d4ca43d21307222326efa68bb27"
-SRCREV_machine_qemuppc ?= "afaa5baa6a9ca9c8a03a9a3eee2ba9fba089f416"
+SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643"
+SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16"
 SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
 
 PR = "r2"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +8 -8

index 82a7224..0f1be83 100644
@@ -17,14 +17,14 @@ KMACHINE_qemuarm = "arm-versatile-926ejs"
 
 KMETA = "meta"
 
-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"
+LINUX_VERSION ?= "3.0.32"
+
+SRCREV_machine_qemuarm ?= "b8b6c3b6b3edf129ac26a27d779dd972c36e8ebd"
+SRCREV_machine_qemumips ?= "33a643547e983adb442ff8e15645881816b17a7d"
+SRCREV_machine_qemuppc ?= "bd9a3c4c066bd4b9f52b51aaaec9b029a7abe793"
+SRCREV_machine_qemux86 ?= "70342faea067476774eb55f4e3098af0bcc48782"
+SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65"
+SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b"
 SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
 
 PR = "r4"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #4 lore raw

PATCH 4/9 linux-yocto: remove v2.6.37 recipe

In reply to Bruce Ashfield

With the introduction of the 3.4 kernel recipe, the 2.6.37 kernel recipe is removed, keeping the supported list at three kernels.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb |   38 -----------------------
 1 files changed, 0 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-kernel/linux/linux-yocto_2.6.37.bb

meta/recipes-kernel/linux/linux-yocto_2.6.37.bb deleted +0 ~~-38~~

deleted file mode 100644
index 3968c62..0000000
@@ -1,38 +0,0 @@
-inherit kernel
-require linux-yocto.inc
-
-KMACHINE = "yocto/standard/base"
-KMACHINE_qemux86  = "yocto/standard/common-pc/base"
-KMACHINE_qemux86-64  = "yocto/standard/common-pc-64/base"
-KMACHINE_qemuppc  = "yocto/standard/qemu-ppc32"
-KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
-KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
-
-KBRANCH = "${KMACHINE}"
-
-KMETA = "meta"
-
-LINUX_VERSION ?= "2.6.37"
-
-SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d"
-SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680"
-SRCREV_machine_qemuppc = "862faf3666b3a4e4bc1d469ff5fb3fb90c25f621"
-SRCREV_machine_qemux86 = "27ad78e1f6378da554775a7d6760730c92f8c5a7"
-SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c"
-SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f"
-SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e"
-
-PR = "r23"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
-
-# Functionality flags
-KERNEL_FEATURES = "features/netfilter"
-KERNEL_FEATURES_append = " features/taskstats"
-KERNEL_FEATURES_append_qemux86 = " cfg/sound"
-KERNEL_FEATURES_append_qemux86-64 = " cfg/sound"
-
-require linux-tools.inc

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #5 lore raw

PATCH 5/9 linux-yocto: add machine aliases for yocto BSPs

In reply to Bruce Ashfield

To avoid mapping machine names to kernel machine names in recipes, we can define multiple KMACHINE names for a single in tree board. This allows the tools to match a board description to multiple different MACHINEs.

As a result, we can remove the explicit KMACHINE mappings from the linux-yocto recipes and allow the KMACHINE=${MACHINE} default to handle mappings. Individual recipes an bbappends can override this as required.

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb   |    9 +--------
 meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb   |    9 +--------
 meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb |    3 +--
 meta/recipes-kernel/linux/linux-yocto_3.0.bb      |    9 +--------
 meta/recipes-kernel/linux/linux-yocto_3.2.bb      |    9 +--------
 5 files changed, 5 insertions(+), 34 deletions(-)

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -8

index 929aa85..508beb1 100644
@@ -1,13 +1,6 @@
 inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
 
-KMACHINE = "common-pc"
-KMACHINE_qemux86  = "common-pc"
-KMACHINE_qemux86-64  = "common-pc-64"
-KMACHINE_qemuarm  = "arm-versatile-926ejs"
-KMACHINE_qemuppc  = "qemu-ppc32"
-KMACHINE_qemumips = "mti-malta32-be"
-
 KBRANCH = "yocto/standard/preempt-rt/base"
 KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"

@@ -17,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643"
 SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16"
-SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
+SRCREV_meta ?= "b040132c19d70b00fc49f3b7e08c2ed52ac59f92"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +1 -8

index f881c1f..f27e39e 100644
@@ -1,13 +1,6 @@
 inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
 
-KMACHINE = "common-pc"
-KMACHINE_qemux86  = "common-pc"
-KMACHINE_qemux86-64  = "common-pc-64"
-KMACHINE_qemuarm  = "arm-versatile-926ejs"
-KMACHINE_qemuppc  = "qemu-ppc32"
-KMACHINE_qemumips = "mti-malta32-be"
-
 KBRANCH = "standard/preempt-rt/base"
 KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"

@@ -18,7 +11,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087"
 SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f"
-SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
+SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +1 -2

index 80be112..81aefb1 100644
@@ -4,7 +4,6 @@ require recipes-kernel/linux/linux-yocto.inc
 # We need lzma (as CONFIG_KERNEL_LZMA=y)
 DEPENDS += "xz-native"
 
-KMACHINE = "common-pc"
 KBRANCH = "standard/tiny"
 LINUX_KERNEL_TYPE = "tiny"
 KCONFIG_MODE = "--allnoconfig"

@@ -12,7 +11,7 @@ KCONFIG_MODE = "--allnoconfig"
 LINUX_VERSION ?= "3.2.18"
 
 SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
-SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
+SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -8

index 0f1be83..cfae247 100644
@@ -8,13 +8,6 @@ KBRANCH_qemuppc  = "yocto/standard/qemu-ppc32"
 KBRANCH_qemumips = "yocto/standard/mti-malta32-be"
 KBRANCH_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
-# Temporary until 3.0 kernel tree is updated with machine mappings
-KMACHINE_qemux86 = "common-pc"
-KMACHINE_qemux86-64 = "common-pc-64"
-KMACHINE_qemuppc = "qemu-ppc32"
-KMACHINE_qemumips = "mti-malta32-be"
-KMACHINE_qemuarm = "arm-versatile-926ejs"
-
 KMETA = "meta"
 
 LINUX_VERSION ?= "3.0.32"

@@ -25,7 +18,7 @@ SRCREV_machine_qemuppc ?= "bd9a3c4c066bd4b9f52b51aaaec9b029a7abe793"
 SRCREV_machine_qemux86 ?= "70342faea067476774eb55f4e3098af0bcc48782"
 SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65"
 SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b"
-SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23"
+SRCREV_meta ?= "b040132c19d70b00fc49f3b7e08c2ed52ac59f92"
 
 PR = "r4"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.2.bb +1 -8

index 665ddca..ac4e454 100644
@@ -1,13 +1,6 @@
 inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
 
-KMACHINE = "common-pc"
-KMACHINE_qemux86  = "common-pc"
-KMACHINE_qemux86-64  = "common-pc-64"
-KMACHINE_qemuppc  = "qemu-ppc32"
-KMACHINE_qemumips = "mti-malta32-be"
-KMACHINE_qemuarm  = "arm-versatile-926ejs"
-
 KBRANCH = "standard/default/base"
 KBRANCH_qemux86  = "standard/default/common-pc/base"
 KBRANCH_qemux86-64  = "standard/default/common-pc-64/base"

@@ -23,7 +16,7 @@ SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162"
 SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48"
 SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c"
 SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
-SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
+SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #6 lore raw

PATCH 6/9 linux-yocto: add 3.4 recipe

In reply to Bruce Ashfield

Introducing the 3.4 kernel recipe. At this point there are three supported kernel 3.4, 3.2 and 3.0.

Build and boot tested on qemux86, qemux86-64, qemuarm, qemumips and qemuppc

Signed-off-by Bruce Ashfield <[email protected]>

---
 meta/recipes-kernel/linux/linux-yocto_3.4.bb |   38 ++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.4.bb

meta/recipes-kernel/linux/linux-yocto_3.4.bb new file +38 -0

new file mode 100644
index 0000000..81816b1
@@ -0,0 +1,38 @@
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
+
+KBRANCH = "standard/base"
+KBRANCH_qemux86  = "standard/common-pc/base"
+KBRANCH_qemux86-64  = "standard/common-pc-64/base"
+KBRANCH_qemuppc  = "standard/qemuppc"
+KBRANCH_qemumips = "standard/mti-malta32"
+KBRANCH_qemumips64 = "standard/mti-malta64"
+KBRANCH_qemumips64el = "standard/mti-malta64"
+KBRANCH_qemuarm  = "standard/arm-versatile-926ejs"
+
+SRCREV_machine_qemuarm ?= "bc7dd2ebe7f5443fb9d89d46106053cfc69b5d7f"
+SRCREV_machine_qemumips ?= "5a2ad0078de3d24a6e8e3f3c9a7426a08a86717d"
+SRCREV_machine_qemuppc ?= "f92ab2a332627c0213ecfdfc873d470be008f86b"
+SRCREV_machine_qemux86 ?= "780ab7e11f03931295e8f0e29707f2abb688e9ad"
+SRCREV_machine_qemux86-64 ?= "780ab7e11f03931295e8f0e29707f2abb688e9ad"
+SRCREV_machine ?= "780ab7e11f03931295e8f0e29707f2abb688e9ad"
+SRCREV_meta ?= "3fd089debe624c642d7b4d9363f853021d1675b2"
+
+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.1"
+
+PR = "r0"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+
+KMETA = "meta"
+
+COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
+
+# Functionality flags
+KERNEL_REVISION_CHECKING=""
+KERNEL_FEATURES="features/netfilter"
+KERNEL_FEATURES_append_qemux86=" cfg/sound"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
+
+require recipes-kernel/linux/linux-tools.inc

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #7 lore raw

PATCH 7/9 linux-yocto/3.2: fri2 and chiefriver machine updates

In reply to Bruce Ashfield

Bumping the 3.2 SRCREVs to pickup the following configuration changes for the new chiefriver BSP and the existing fri2 machines:

5b4c9dc fri2: update base config
cdfbb50 fri2: add usb-mass-storage to standard and preempt-rt 3c1af06 fri2 update: drop NETDEVICE, e1xxx, usb-mass-storage, add iwlwifi feature 26a4d79 iwlagn: Correct a comment typo
ade9c57 iwlwifi: Add a feature for iwlwifi
571b6cb fri2: Configuration update (usb, wifi, i2c)
b257485 meta: add tmp/rc6 feature
24c6494 chiefriver: create initial BSP infrastructure

All branches are also updated with the following fix:

1ce6700 efi: Add patch to fix 32bit EFI service mapping (rhbz 726701)

Signed-off-by Darren Hart <[email protected]>

Signed-off-by Tom Zanussi <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

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

meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb +3 -3

index f27e39e..a07b27a 100644
@@ -9,9 +9,9 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 KMETA = "meta"
 
-SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087"
-SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f"
-SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
+SRCREV_machine ?= "c413f23eafb3e91ff98653e578e771532fd71be9"
+SRCREV_machine_qemuppc ?= "d7020ba154df03cba5351011ff664f5e3e1ce678"
+SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb +2 -2

index 81aefb1..546971b 100644
@@ -10,8 +10,8 @@ KCONFIG_MODE = "--allnoconfig"
 
 LINUX_VERSION ?= "3.2.18"
 
-SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
-SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
+SRCREV_machine ?= "27b68a93eb791e830da8d3a2c0fc99780897ad89"
+SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.2.bb +7 -7

index ac4e454..85c0096 100644
@@ -10,13 +10,13 @@ KBRANCH_qemuarm  = "standard/default/arm-versatile-926ejs"
 
 LINUX_VERSION ?= "3.2.18"
 
-SRCREV_machine_qemuarm ?= "259cff0813417d16baaaaf44b00a9f75103ebfcb"
-SRCREV_machine_qemumips ?= "9a803ecc05b3af481036a6d9bb0da3a899be3074"
-SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162"
-SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48"
-SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c"
-SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
-SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
+SRCREV_machine_qemuarm ?= "ebb5e65d02a352e3e8601096e1674ffc261345f2"
+SRCREV_machine_qemumips ?= "62aeb307e9a731c4bba05ce4d57b9cece41a2a01"
+SRCREV_machine_qemuppc ?= "1396a8f7b62f8926dc1fa474c7d94ae920d81852"
+SRCREV_machine_qemux86 ?= "9d32bb075e349cc69c7af42b60f6715c5d8c972e"
+SRCREV_machine_qemux86-64 ?= "dd488f551fa0f8e3bf1aadd78083b8547bba8bdf"
+SRCREV_machine ?= "76133a1cadf0de417c29ed15d6fbb12c41c0802b"
+SRCREV_meta ?= "ee78519365bdb25287703bbc31c06b193263c654l"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #8 lore raw

PATCH 8/9 linux-yocto/3.0: add cedartrail kernel features

In reply to Bruce Ashfield

Updating meta to move Kernel Features out of the BSP and add to the Cedartrail Machine branch.

Signed-off-by Kishore Bodke <[email protected]>

Signed-off-by Bruce Ashfield <[email protected]>

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

meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1

index 508beb1..a39b966 100644
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643"
 SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16"
-SRCREV_meta ?= "b040132c19d70b00fc49f3b7e08c2ed52ac59f92"
+SRCREV_meta ?= "46e8fc2bbbe73514e8d99101adaaa373f760ffa7"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"

meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1

index cfae247..440821c 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "bd9a3c4c066bd4b9f52b51aaaec9b029a7abe793"
 SRCREV_machine_qemux86 ?= "70342faea067476774eb55f4e3098af0bcc48782"
 SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65"
 SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b"
-SRCREV_meta ?= "b040132c19d70b00fc49f3b7e08c2ed52ac59f92"
+SRCREV_meta ?= "46e8fc2bbbe73514e8d99101adaaa373f760ffa7"
 
 PR = "r4"
 PV = "${LINUX_VERSION}+git${SRCPV}"

Signature · 1 line

1.7.5.4

Bruce Ashfield

author

2012-06-07 20:10 UTC #9 lore raw

PATCH 9/9 kern-tools: anchor KMACHINE test

In reply to Bruce Ashfield

Updating the kern-tools SRCREV to pick up the following fix:

Out of tree feature descriptions (.scc files) take two forms: normal features and BSP descriptions.

A normal feature is detected and added to the end of the current machine being processed. During tree processing, it's configuration and patches will be applied.

A BSP description on the other hand must be matched based on three critera (which are in the .scc file via "define <foo>"):

- machine
- kernel type
- architecture

Since features that define machines are only explicitly added, they are removed from the list of features that should be automatically added.

The criteria for removing them from the auto-add list is the definitions found in the .scc file. The existing check was simply for KMACHINE anywhere in the file. This meant that a conditional or even a comment containing that phrase would exclude a file.

Properly anchoring the KMACHINE test to "^define.*KMACHINE" fixes the problem of overly agreesive exclusions.

Signed-off-by Bruce Ashfield <[email protected]>

---
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1

index becb0de..2329ab9 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "0859d2f73cc6f6973835fa5713b5a98a43ed43ff"
+SRCREV = "4b1fef0a85db38bad6db7f14d44ea59713a64fdb"
 PR = "r12"
 PV = "0.1+git${SRCPV}"

Signature · 1 line

1.7.5.4

Richard Purdie

Applied

2012-06-08 11:10 UTC #10 lore raw

In reply to Bruce Ashfield

Quoted 42 lines · Bruce Ashfield

Richard/Saul,
Here's a 9 patch series that is a collection of work that's been brewing for about three weeks.
Highlights include:
- removal of the 2.6.37 recipe, it's time is now gone
- addition of the 3.4 kernel recipe
- configuration fixups and audits within that 3.4 kernel
- kernel *only* support for mips64 mti emulation
- -stable updates for supported kernels 3.2.18, 3.0.32
- machine fixes/configurations for the 3.2 and 3.0 kernels
- kern tool updates, streamlining and fixes
I've built and booted the qemu* machines on 3.4, and have been doing this for several weeks now. Built and boot tests have also happened on the 3.0 and 3.2 trees as well. Some BSP layers are already using these changes.
The tools changes set the stage for some follow on changes that I'm nearly done for the next oe-core/yocto release, but they are useful by themselves, so I'm getting them out of my queue.
I'll follow up to other lists with updates to recipes and configs that reference the modified kernels.
BSP layers can be updated as appropriate, since all these changes have been pushed to the various kernel trees.
Cheers,
Bruce
The following changes since commit df8f55a919b3cc602ce1f1c51630c7edf6e36b55:
ltp: Add patch to correct failing build (2012-06-05 23:05:00 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel-oe
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-oe

Quoted 10 lines

Bruce Ashfield (9):
kern-tools: remove unused code, meta branch and directory assumptions linux-yocto/3.2: update to v3.2.18
linux-yocto/3.0: update to v3.0.32
linux-yocto: remove v2.6.37 recipe
linux-yocto: add machine aliases for yocto BSPs
linux-yocto: add 3.4 recipe
linux-yocto/3.2: fri2 and chiefriver machine updates linux-yocto/3.0: add cedartrail kernel features
kern-tools: anchor KMACHINE test

Merged to master, thanks.

Richard