[PATCH 0/7] linux-yocto/meta-yocto: consolidated pull request

[PATCH 0/7] linux-yocto/meta-yocto: consolidated pull request

[Bruce Ashfield]

Richard/Saul,

This stack on top of my 9 patch series to oe-core. This patch series
does largely the same thing as the oe-core one:

  - removes 2.6.37
  - adds 2.6.34
  - updates recipes for machine / tool changes
  - make 3.4 the default kernel for qemu*

Cheers,

Bruce

The following changes since commit 987e5fba8f7b6f09cc96f4e3d2a5857209a45b7b:

  kern-tools: anchor KMACHINE test (2012-06-07 15:46:53 -0400)

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

Bruce Ashfield (7):
  linux-yocto/meta-yocto: update to v3.0.32
  linux-yocto/meta-yocto: update to v3.2.18
  linux-yocto/meta-yocto: remove 2.6.37 bbappend
  linux-yocto/meta-yocto: add machine aliases for yocto BSPs
  linux-yocto/meta-yocto: introduce 3.4 bbappend
  linux-yocto/meta-yocto/3.2: fri2 and chiefriver machine updates
  meta-yocto: make 3.4 the default kernel for qemu*

 meta-yocto/conf/distro/poky.conf                   |   12 ++++++------
 .../linux/linux-yocto-rt_3.0.bbappend              |    6 +++---
 .../linux/linux-yocto_2.6.37.bbappend              |   14 --------------
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |   11 ++++-------
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |   13 ++++---------
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   14 ++++++++++++++
 6 files changed, 31 insertions(+), 39 deletions(-)
 delete mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
 create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend

-- 
1.7.5.4

[PATCH 1/7] linux-yocto/meta-yocto: update to v3.0.32

[Bruce Ashfield]

Updating the kernel SRCREVs to pickup the v3.0.32 -stable release.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../linux/linux-yocto-rt_3.0.bbappend              |    6 +++---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
index 74aa294..fdd9f7d 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
@@ -4,13 +4,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_atom-pc = "atom-pc"
 KMACHINE_atom-pc = "atom-pc"
 KBRANCH_atom-pc = "yocto/standard/preempt-rt/base"
-SRCREV_machine_pn-linux-yocto-rt_atom-pc = "2f9d925f5681eaae7f341cc1270c739e8b329c03"
+SRCREV_machine_pn-linux-yocto-rt_atom-pc = "e67428d9966eecec4c081993dc64ceb5c0e64643"
 
 # mpc8315e-rdb support
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
 KBRANCH_mpc8315e-rdb = "yocto/standard/preempt-rt/base"
-SRCREV_machine_pn-linux-yocto-rt_mpc8315e-rdb = "2f9d925f5681eaae7f341cc1270c739e8b329c03"
+SRCREV_machine_pn-linux-yocto-rt_mpc8315e-rdb = "e67428d9966eecec4c081993dc64ceb5c0e64643"
 
 # beagleboard support - 3.0 support has not yet been completed, build failure
 #COMPATIBLE_MACHINE_beagleboard = "beagleboard"
@@ -22,4 +22,4 @@ SRCREV_machine_pn-linux-yocto-rt_mpc8315e-rdb = "2f9d925f5681eaae7f341cc1270c739
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
 KMACHINE_routerstationpro = "routerstationpro"
 KBRANCH_routerstationpro = "yocto/standard/preempt-rt/routerstationpro"
-SRCREV_machine_pn-linux-yocto-rt_routerstationpro = "855fb36f410e5ed1b42a2cb9d4f10c55e5a510c1"
+SRCREV_machine_pn-linux-yocto-rt_routerstationpro = "94b9545c58bf4dee8321b800b90958d10875fda8"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 4c483ca..2313034 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -6,10 +6,10 @@ KBRANCH_beagleboard = "yocto/standard/beagleboard"
 # temporary until 3.0 tree is updated to have machine mapping
 KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
 
-SRCREV_machine_atom-pc ?= "afdda882f902dd28693cd8701a7d497958290f09"
-SRCREV_machine_routerstationpro ?= "220d89fcf345ee28fb0cdcf0f33f83b3dc7c460f"
-SRCREV_machine_mpc8315e-rdb ?= "83f422f718cf15633cb4c2d309aa041c3c354f65"
-SRCREV_machine_beagleboard ?= "8fd5a8eb4067c7032389e82d54f0e54e1e27f78c"
+SRCREV_machine_atom-pc ?= "45d64709c00fce6e9b76a638c4ca6f30a8e9d25a"
+SRCREV_machine_routerstationpro ?= "21bd4a0a3b0f061e4640dd1011ebc94d122b5e40"
+SRCREV_machine_mpc8315e-rdb ?= "0c781e306559d5e9816e202a60aa2543f4eea39e"
+SRCREV_machine_beagleboard ?= "567c989c90ce5f2c62f6ef788be763150b65a0fb"
 
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-- 
1.7.5.4

[PATCH 2/7] linux-yocto/meta-yocto: update to v3.2.18

[Bruce Ashfield]

Updating the 3.2 linux-yocto SRCREVs to pick up the v3.2.18
-stable release.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
index 589904f..815650a 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -8,10 +8,10 @@ KBRANCH_routerstationpro = "standard/default/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/default/fsl-mpc8315e-rdb"
 KBRANCH_beagleboard = "standard/default/beagleboard"
 
-SRCREV_machine_atom-pc ?= "f29531a41df15d74be5ad47d958e4117ca9e489e"
-SRCREV_machine_routerstationpro ?= "a6755fa847a9362470d31a6d71d08069ece749ff"
-SRCREV_machine_mpc8315e-rdb ?= "818339ef5a53e281e28fdcf10aca1183c4ff71e0"
-SRCREV_machine_beagleboard ?= "90e3138c5a2a390dd6ddf2ed84fe5a9756d43397"
+SRCREV_machine_atom-pc ?= "624509ef194d14aa498ed6f1620093b8e40e3a30"
+SRCREV_machine_routerstationpro ?= "6eb6f908bbca493bbce4b7c460f8bf07272a78a9"
+SRCREV_machine_mpc8315e-rdb ?= "bd08c2cdee3c980060ee6d3206ece374570f74d2"
+SRCREV_machine_beagleboard ?= "ab826acad523e8858dcf867847a732c7288b5dc7"
 
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-- 
1.7.5.4

[PATCH 3/7] linux-yocto/meta-yocto: remove 2.6.37 bbappend

[Bruce Ashfield]

With the introduction of the 3.4 kernel, the 2.6.37 kernel recipe is
removed, so we'll also remove the meta-yocto 2.6.37 bbappend.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../linux/linux-yocto_2.6.37.bbappend              |   14 --------------
 1 files changed, 0 insertions(+), 14 deletions(-)
 delete mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
deleted file mode 100644
index 24b6cea..0000000
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_2.6.37.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-KMACHINE_atom-pc  = "yocto/standard/common-pc/atom-pc"
-KMACHINE_routerstationpro = "yocto/standard/routerstationpro"
-KMACHINE_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
-KMACHINE_beagleboard = "yocto/standard/beagleboard"
-
-SRCREV_machine_atom-pc = "fce17f046d3756045e4dfb49221d1cf60fcae329"
-SRCREV_machine_routerstationpro = "8f84c1aec0907766ab6d6ac79fcc3b7b9ce79b70"
-SRCREV_machine_mpc8315e-rdb = "bda049366dad5fc3c7ba229cd4633992581e7a1f"
-SRCREV_machine_beagleboard = "3ddb22772862a8223640fa97580569924f51bddc"
-
-COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
-COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-COMPATIBLE_MACHINE_atom-pc = "atom-pc"
-- 
1.7.5.4

[PATCH 4/7] linux-yocto/meta-yocto: add machine aliases for yocto BSPs

[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 <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto_3.0.bbappend  |    3 ---
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    5 -----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
index 2313034..d0608bc 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.0.bbappend
@@ -3,9 +3,6 @@ KBRANCH_routerstationpro = "yocto/standard/routerstationpro"
 KBRANCH_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
 KBRANCH_beagleboard = "yocto/standard/beagleboard"
 
-# temporary until 3.0 tree is updated to have machine mapping
-KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
-
 SRCREV_machine_atom-pc ?= "45d64709c00fce6e9b76a638c4ca6f30a8e9d25a"
 SRCREV_machine_routerstationpro ?= "21bd4a0a3b0f061e4640dd1011ebc94d122b5e40"
 SRCREV_machine_mpc8315e-rdb ?= "0c781e306559d5e9816e202a60aa2543f4eea39e"
diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
index 815650a..dfb019b 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -1,8 +1,3 @@
-KMACHINE_atom-pc  = "atom-pc"
-KMACHINE_routerstationpro = "routerstationpro"
-KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
-KMACHINE_beagleboard = "beagleboard"
-
 KBRANCH_atom-pc  = "standard/default/common-pc/atom-pc"
 KBRANCH_routerstationpro = "standard/default/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/default/fsl-mpc8315e-rdb"
-- 
1.7.5.4

[PATCH 5/7] linux-yocto/meta-yocto: introduce 3.4 bbappend

[Bruce Ashfield]

Creating the initial meta-yocto bbappend for the 3.4 kernel.
The routerstationpro and beaglboard are not initially marked as
compatible since full testing has not completed. Future updates
will remove this restriction.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto_3.4.bbappend  |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
new file mode 100644
index 0000000..cb8c3aa
--- /dev/null
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -0,0 +1,14 @@
+KBRANCH_atom-pc  = "standard/common-pc/atom-pc"
+KBRANCH_routerstationpro = "standard/routerstationpro"
+KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
+KBRANCH_beagleboard = "standard/beagleboard"
+
+SRCREV_machine_atom-pc ?= "780ab7e11f03931295e8f0e29707f2abb688e9ad"
+SRCREV_machine_routerstationpro ?= "780ab7e11f03931295e8f0e29707f2abb688e9ad"
+SRCREV_machine_mpc8315e-rdb ?= "2d99f67fe6b4301cefd4e6f9a5ce75a9cc84686b"
+SRCREV_machine_beagleboard ?= "780ab7e11f03931295e8f0e29707f2abb688e9ad"
+
+COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
+# COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
+# COMPATIBLE_MACHINE_beagleboard = "beagleboard"
+COMPATIBLE_MACHINE_atom-pc = "atom-pc"
-- 
1.7.5.4

[PATCH 6/7] linux-yocto/meta-yocto/3.2: fri2 and chiefriver machine updates

[Bruce Ashfield]

Picking up the oe-core commit:

    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: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
index dfb019b..fa160f8 100644
--- a/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
+++ b/meta-yocto/recipes-kernel/linux/linux-yocto_3.2.bbappend
@@ -3,10 +3,10 @@ KBRANCH_routerstationpro = "standard/default/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/default/fsl-mpc8315e-rdb"
 KBRANCH_beagleboard = "standard/default/beagleboard"
 
-SRCREV_machine_atom-pc ?= "624509ef194d14aa498ed6f1620093b8e40e3a30"
-SRCREV_machine_routerstationpro ?= "6eb6f908bbca493bbce4b7c460f8bf07272a78a9"
-SRCREV_machine_mpc8315e-rdb ?= "bd08c2cdee3c980060ee6d3206ece374570f74d2"
-SRCREV_machine_beagleboard ?= "ab826acad523e8858dcf867847a732c7288b5dc7"
+SRCREV_machine_atom-pc ?= "41074a778d251a77e036fd8a99915cd4da6cd8f7"
+SRCREV_machine_routerstationpro ?= "94abc0d75d0a99c40c53402570cd9c569539fee9"
+SRCREV_machine_mpc8315e-rdb ?= "a04e94f4dae9cf6d32d059cf9e0308abe7341a3a"
+SRCREV_machine_beagleboard ?= "40bde7a43ef3cd85729ab02464a7ecdf71e522a6"
 
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
-- 
1.7.5.4

[PATCH 7/7] meta-yocto: make 3.4 the default kernel for qemu*

[Bruce Ashfield]

The 3.4 kernel is available and has been built and booted on
all the qemu machines, so it now becomes the default for the
qemu machines, and machines that don't explicitly set a preferred
version.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-yocto/conf/distro/poky.conf |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 9c1e4b6..cc9fa6c 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -12,12 +12,12 @@ LOCALCONF_VERSION = "1"
 
 DISTRO_FEATURES_append = " largefile opengl"
 
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
-PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.2%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.2%"
-PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.2%"
-PREFERRED_VERSION_linux-yocto_qemumips ?= "3.2%"
-PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.2%"
+PREFERRED_VERSION_linux-yocto ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_qemumips ?= "3.4%"
+PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.4%"
 
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
-- 
1.7.5.4

Re: [PATCH 0/7] linux-yocto/meta-yocto: consolidated pull request

[Richard Purdie]

On Thu, 2012-06-07 at 16:03 -0400, Bruce Ashfield wrote:
> Richard/Saul,
> 
> This stack on top of my 9 patch series to oe-core. This patch series
> does largely the same thing as the oe-core one:
> 
>   - removes 2.6.37
>   - adds 2.6.34
>   - updates recipes for machine / tool changes
>   - make 3.4 the default kernel for qemu*
> 
> Cheers,
> 
> Bruce
> 
> The following changes since commit 987e5fba8f7b6f09cc96f4e3d2a5857209a45b7b:
> 
>   kern-tools: anchor KMACHINE test (2012-06-07 15:46:53 -0400)
> 
> are available in the git repository at:
>   git://git.pokylinux.org/poky-contrib zedd/kernel-yocto
>   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-yocto
> 
> Bruce Ashfield (7):
>   linux-yocto/meta-yocto: update to v3.0.32
>   linux-yocto/meta-yocto: update to v3.2.18
>   linux-yocto/meta-yocto: remove 2.6.37 bbappend
>   linux-yocto/meta-yocto: add machine aliases for yocto BSPs
>   linux-yocto/meta-yocto: introduce 3.4 bbappend
>   linux-yocto/meta-yocto/3.2: fri2 and chiefriver machine updates
>   meta-yocto: make 3.4 the default kernel for qemu*

Merged to master, thanks.

Richard