Patchwork [CONSOLIDATED,PULL,11/20] linux-yocto/meta: fix incorrect config references

login
register
mail settings
Submitter Saul Wold
Date March 6, 2012, 5:03 p.m.
Message ID <2944bdfb77b5aaf63a6946e80324c7f8f562b4bb.1331053126.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/22791/
State New
Headers show

Comments

Saul Wold - March 6, 2012, 5:03 p.m.
From: Bruce Ashfield <bruce.ashfield@windriver.com>

Updating the meta SRCREV to pickup the following fixes:

  a9ffedb meta/fri2/sys940x: fix incorrect cfg includes
  3d1a678 meta/sys940x: fix incorrect emgd branch merge

During the merge of the 3.0 BSPs forward to 3.2, a few moved config
fragments were missed.

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

Patch

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index efb1bc9..872289f 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -16,7 +16,7 @@  LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "3652b606f1ab7769a7ecc86c70d22db4ef99fb2a"
 SRCREV_machine_qemuppc ?= "0c8f5214bc15699b41369751cdecea45f717c79c"
-SRCREV_meta ?= "fa83c7b0b47d1aa3e25594ddbcd125a1108d3aaa"
+SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index 2d2542a..6da16c6 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -23,7 +23,7 @@  SRCREV_machine_qemuppc ?= "74364f1062a219eb242d7cb300a404516c297601"
 SRCREV_machine_qemux86 ?= "ea0a62d6821aede782c2b9457639f1ca7f2ddc07"
 SRCREV_machine_qemux86-64 ?= "626165edf65281d9b933a6129e935c7a73ab63a7"
 SRCREV_machine ?= "6f164ae4ef5aeec2bef40a1b936ac1f9b9db46ba"
-SRCREV_meta ?= "fa83c7b0b47d1aa3e25594ddbcd125a1108d3aaa"
+SRCREV_meta ?= "a9ffedb3d7ed7a1da79d8b46b36518865f7ae4d0"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"