summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-08-20 12:21:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-23 23:01:58 +0100
commit8d59fca331c982d9de35eed5ad6a86ade45531c4 (patch)
treeeccee03b612c064c668544f30993c524deda832a
parent29f428d7267f5d87def200a4539e54000528fc89 (diff)
downloadpoky-8d59fca331c982d9de35eed5ad6a86ade45531c4.tar.gz
linux-yocto/3.14: feature merges and configuration updates
As part of LTSI efforts, the 3.14 kernel is receiving feature backports from newer kernels. With this change, we update the 3.14 SRCREVs to make the following changes available: - full nohz backports (v3.16) - loopback NFS (v3.16) - numa updates (v3.16) - cgroups: vm_cgroup: basic infrastructure - cgroups: Resource controller for open files And the following configuration change: - meta: features/ieee802154: add configuration fragment for IEEE 802.15.4 - meta: features/bluetooth: add configuration fragment for Bluetooth support - meta: intel-common-standard: add ericson-3g to intel-common-standard.scc - cgroups: enable virtual memory resource controller - full nohz: Enable full dynticks system for nohz (From OE-Core rev: fe2f51571f97e2cceae974f6a18782025e080c32) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.14.bb16
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 11b8dd9a5c..0c5767a49e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH = "standard/preempt-rt/base" 3KBRANCH = "standard/preempt-rt/base"
4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" 4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5 5
6SRCREV_machine ?= "41b789900aa5f2626069989710603ad1b9ab010f" 6SRCREV_machine ?= "77d54dcdf1e078290d88e85adbbe3f90d41f4c9e"
7SRCREV_machine_qemuppc ?= "b4edefacfca31c880cf3a2188e92c99f69fcb97a" 7SRCREV_machine_qemuppc ?= "ba132753cc6688c1c22d7147b02e434a3441833c"
8SRCREV_meta ?= "3eefa4379f073768df150184e9dad1ff3228a0ff" 8SRCREV_meta ?= "3c987080bc943b8eae37fb6672368bb74978e484"
9 9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
11 11
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index b37e07d216..3e8c0bc671 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -8,8 +8,8 @@ LINUX_VERSION ?= "3.14.13"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "d61940e2aaeeedc43f166c9e7ac763461f380cd2" 11SRCREV_machine ?= "d2f8bdb8818bf2b83ac75b6b5e8428be61242d19"
12SRCREV_meta ?= "3eefa4379f073768df150184e9dad1ff3228a0ff" 12SRCREV_meta ?= "3c987080bc943b8eae37fb6672368bb74978e484"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index 9cf522d9b2..8c3cceec7d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -10,14 +10,14 @@ KBRANCH_qemux86 = "standard/common-pc/base"
10KBRANCH_qemux86-64 = "standard/common-pc-64/base" 10KBRANCH_qemux86-64 = "standard/common-pc-64/base"
11KBRANCH_qemumips64 = "standard/mti-malta64" 11KBRANCH_qemumips64 = "standard/mti-malta64"
12 12
13SRCREV_machine_qemuarm ?= "b712808b59883692245fc2f28defcc03cdb60dd1" 13SRCREV_machine_qemuarm ?= "92de8060e113e4a13f16c6b4b5333f538e291c6d"
14SRCREV_machine_qemumips ?= "f5b6f121c61c72f91b25f85f19e5d410b7f66b21" 14SRCREV_machine_qemumips ?= "313647599dd3cd7f42374d918a9397f82eed36fb"
15SRCREV_machine_qemuppc ?= "047f8cacac6a0f160ea15fb9f6de6a063ddceb63" 15SRCREV_machine_qemuppc ?= "45ef97bc22532a5a2d2fb94df3eec0aca27d0335"
16SRCREV_machine_qemux86 ?= "f148e056dbce4206edd68b4fbd913f2757b3a7bb" 16SRCREV_machine_qemux86 ?= "edec15a07d310c4368b8149496da0548b564a413"
17SRCREV_machine_qemux86-64 ?= "d61940e2aaeeedc43f166c9e7ac763461f380cd2" 17SRCREV_machine_qemux86-64 ?= "d2f8bdb8818bf2b83ac75b6b5e8428be61242d19"
18SRCREV_machine_qemumips64 ?= "cc1dad65948575548188866c85fae5fbd55c7e66" 18SRCREV_machine_qemumips64 ?= "474fc6753d80afbd4483ea5531b03bc5b9c1ac18"
19SRCREV_machine ?= "d61940e2aaeeedc43f166c9e7ac763461f380cd2" 19SRCREV_machine ?= "d2f8bdb8818bf2b83ac75b6b5e8428be61242d19"
20SRCREV_meta ?= "3eefa4379f073768df150184e9dad1ff3228a0ff" 20SRCREV_meta ?= "3c987080bc943b8eae37fb6672368bb74978e484"
21 21
22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 22SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
23 23