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

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

[Bruce Ashfield]

Richard/Saul,

This took a bit longer than I wanted (this was intended for Thursday), but 
since this was potentially the last minor rev bump for yocto 1.1, I wanted 
to build and boot all of the qemu targets, and the -rt targets as well.

While doing this, I noticed that there were still some lurking configuration
cleanups, which are covered under YOCTO #940, so I took the time to ensure
that the machines configure without warnings against 3.0.4. The end configs
are the same (since the options I'm fixing were not translating into the
final .config), but it completes the update to 3.0.x.

The machine SRCREV updates represent the update to 3.0.4, while the meta
branch update contains the following:

Bruce Ashfield (3):
      meta/qemuppc: board description fixes
      meta: remove configuration warnings
      meta: update kver to v3.0.4

Saxena, Rahul (2):
      meta: remove duplicate statement
      meta: remove unused eg20t configuration fragments

The kern-tools fixes contain cleanups and a few generalizations that result 
in easier/more flexible tree generation that I documented for 1.1 and have
been tested for a week now. They won't impact the patching phase validation, so
are safe and good for the release.

I also updated the -rt recipes with the results of the fixes and boot testing.

cc: Tom Zanussi <tom.zanussi@intel.com>
cc: Darren Hart <dvhart@linux.intel.com>

The following changes since commit de5d52711bd810a63a0ad5260b799d6672952c32:

  sanity.bbclass: fix splitting on newlines of SANITY_TESTED_DISTROS (2011-09-02 18:36:20 +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 (3):
  linux-yocto: generalize kernel config search pattern
  linux-yocto: update to v3.0.4
  linux-yocto: clean configuration for v3.0.4

 meta/classes/kernel-yocto.bbclass                  |    2 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb    |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

-- 
1.7.4.1

[PATCH 1/3] linux-yocto: generalize kernel config search pattern

[Bruce Ashfield]

After constructing a kernel configuration file it then needs
to be located in the tree so it can be audited against the
final .config. The previous string that was used for the search
pattern contains the kernel version. If the recipe space kernel
version and internal tree version are out of sync, this will
cause the constructed config to not be found. By removing the
version from the search string, we can still find out config and
gracefully adapt to minor version skew.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass                  |    2 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index daaee50..0f92267 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -105,7 +105,7 @@ python do_kernel_configcheck() {
     bb.plain("NOTE: validating kernel configuration")
 
     pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
-    cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config-${LINUX_VERSION} ${B} ${S} ${B} ${KBRANCH}",d )
+    cmd = bb.data.expand("cd ${B}/..; kconf_check -${LINUX_KERNEL_TYPE}-config- ${B} ${S} ${B} ${KBRANCH}",d )
     ret, result = commands.getstatusoutput("%s%s" % (pathprefix, cmd))
 
     bb.plain( "%s" % result )
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 1649bbc..edaaea6 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "eab0c4eeb9fdb3d83e7aca4b70334cc7b02540b6"
+SRCREV = "60723c84395a9ac1753589824e30be39a781bb82"
 PR = r10
 PV = "0.1+git${SRCPV}"
 
-- 
1.7.4.1

[PATCH 2/3] linux-yocto: update to v3.0.4

[Bruce Ashfield]

The v3.0.4 stable kernel is available and it can now be merged
into linux-yocto. Build and boot tested on all qemu* machines.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 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(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 2bee543..e8e251d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -11,11 +11,11 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "yocto/standard/preempt-rt/base"
 KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.0.3"
+LINUX_VERSION ?= "3.0.4"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "c86423d29c94525d18ef1c9b6c025f733c1e8252"
-SRCREV_machine_qemuppc ?= "ccb47c9e8d85dc00ccd28bc6819d7769e2c11cb3"
+SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
+SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
 SRCREV_meta ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
 
 PR = "r0"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index e39be0d..221f81b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -10,14 +10,14 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
 KBRANCH = ${KMACHINE}
 
-LINUX_VERSION ?= "3.0.3"
-
-SRCREV_machine_qemuarm ?= "eecaa32095ab63e0a73f161cf48fd02251eb6c88"
-SRCREV_machine_qemumips ?= "eee3cb2066bb6aae5b3869083cb477b03eb87c79"
-SRCREV_machine_qemuppc ?= "c0da1d35dee9fb63ba6bfc7907a77b0feb89766e"
-SRCREV_machine_qemux86 ?= "8b51ddba0f85a6bb8e105b37a9ac03fb58b9de20"
-SRCREV_machine_qemux86-64 ?= "965dd365cf3652347960f7145ac188c86c323070"
-SRCREV_machine ?= "49d93fb0c9e1645ba0bb8951be23e56ea227a5bd"
+LINUX_VERSION ?= "3.0.4"
+
+SRCREV_machine_qemuarm ?= "b18f5c601ccc90b4c94d1d29282cf7c53fcb6e22"
+SRCREV_machine_qemumips ?= "0696ab4056ddc1b4504e8636e47a918bdff5b257"
+SRCREV_machine_qemuppc ?= "af58047d79790a06e5ac5ba09837c6e65220d7aa"
+SRCREV_machine_qemux86 ?= "515e039eeb316494955e46d38c164e56999511ae"
+SRCREV_machine_qemux86-64 ?= "d19118d19d5f95e83d6fbe1268fe6b84f67de6d3"
+SRCREV_machine ?= "6fcf6f1bca9323fa2e9a5ea15fa84153cccbc28b"
 SRCREV_meta ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
 
 PR = "r1"
-- 
1.7.4.1

[PATCH 3/3] linux-yocto: clean configuration for v3.0.4

[Bruce Ashfield]

Fixes [YOCTO #940]

Since v3.0.4 is likely the last stable update in the the release
timeframe a configuration audit was performed. This updates the
SRCREV to remove obselete, and improperly defined configuration
items. With this, all qemu* BSPs configure with no warnings.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 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(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index e8e251d..d100cea 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
 SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
-SRCREV_meta ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
+SRCREV_meta ?= "258af0b952b723806baa429b65e3d8cb0d742190"
 
 PR = "r0"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 221f81b..e0e8a1b 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "af58047d79790a06e5ac5ba09837c6e65220d7aa"
 SRCREV_machine_qemux86 ?= "515e039eeb316494955e46d38c164e56999511ae"
 SRCREV_machine_qemux86-64 ?= "d19118d19d5f95e83d6fbe1268fe6b84f67de6d3"
 SRCREV_machine ?= "6fcf6f1bca9323fa2e9a5ea15fa84153cccbc28b"
-SRCREV_meta ?= "5b535279e61197cb194bb2dfceb8b7a04128387c"
+SRCREV_meta ?= "258af0b952b723806baa429b65e3d8cb0d742190"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
-- 
1.7.4.1

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

[Richard Purdie]

On Fri, 2011-09-02 at 23:03 -0400, Bruce Ashfield wrote:
> Richard/Saul,
> 
> This took a bit longer than I wanted (this was intended for Thursday), but 
> since this was potentially the last minor rev bump for yocto 1.1, I wanted 
> to build and boot all of the qemu targets, and the -rt targets as well.
> 
> While doing this, I noticed that there were still some lurking configuration
> cleanups, which are covered under YOCTO #940, so I took the time to ensure
> that the machines configure without warnings against 3.0.4. The end configs
> are the same (since the options I'm fixing were not translating into the
> final .config), but it completes the update to 3.0.x.
> 
> The machine SRCREV updates represent the update to 3.0.4, while the meta
> branch update contains the following:
> 
> Bruce Ashfield (3):
>       meta/qemuppc: board description fixes
>       meta: remove configuration warnings
>       meta: update kver to v3.0.4
> 
> Saxena, Rahul (2):
>       meta: remove duplicate statement
>       meta: remove unused eg20t configuration fragments
> 
> The kern-tools fixes contain cleanups and a few generalizations that result 
> in easier/more flexible tree generation that I documented for 1.1 and have
> been tested for a week now. They won't impact the patching phase validation, so
> are safe and good for the release.
> 
> I also updated the -rt recipes with the results of the fixes and boot testing.
> 
> cc: Tom Zanussi <tom.zanussi@intel.com>
> cc: Darren Hart <dvhart@linux.intel.com>
> 
> The following changes since commit de5d52711bd810a63a0ad5260b799d6672952c32:
> 
>   sanity.bbclass: fix splitting on newlines of SANITY_TESTED_DISTROS (2011-09-02 18:36:20 +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 (3):
>   linux-yocto: generalize kernel config search pattern
>   linux-yocto: update to v3.0.4
>   linux-yocto: clean configuration for v3.0.4

Merged to master, thanks.

Richard