summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-09-04 17:28:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-05 16:37:14 (GMT)
commit5084e47851fe9e1b3cabfb1dfe96f754975ce740 (patch)
treebed10aec34855ec352a5e514d7e918ecede03bf6
parent2000698b17011bbde1c3e5bb01a7d6763316db5a (diff)
downloadpoky-5084e47851fe9e1b3cabfb1dfe96f754975ce740.tar.gz
linux-yocto-rt: 3.4.9-rt17 remaining changes
The first import of 3.4.9-rt17 only picked up part of the import due to a merge conflict with the modified files, and then SRCREVs being generated from the pre-merge commit. This SRCREV update picks up the rest of the modified files for full -rt support. (From OE-Core rev: d1ec0b64018dafaa6e47233b3465fbe4189e6280) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index ae64de1..b2620ea 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "52518e60a7220385f31cdd09b83dacd84581c88c" 11SRCREV_machine ?= "9032b1e9daf5b4396f939981c3be95f67802d18c"
12SRCREV_machine_qemuppc ?= "e6db5e91e1a5b31d26ac67778df7fb1fd5e42aa5" 12SRCREV_machine_qemuppc ?= "08ce190232f89303772b6591ca7daaf2820eb74e"
13SRCREV_meta ?= "463299bc2e533e1bd38b0053ae7b210980f269c3" 13SRCREV_meta ?= "463299bc2e533e1bd38b0053ae7b210980f269c3"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"