diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-10-01 00:43:33 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-02 00:42:43 +0100 |
commit | 1e3a3cd6e7f6e9462afac90317ec0d2f6a3f974b (patch) | |
tree | 1364392155fd985c6d40dc9d341393596c8827ee /meta | |
parent | ce9f31aaeed3feccf7c779dd90f9bfeda2c65bb8 (diff) | |
download | poky-1e3a3cd6e7f6e9462afac90317ec0d2f6a3f974b.tar.gz |
linux-yocto/3.14: revert BFP feature, and fix intel-common -rt
The BPF feature is causing build failures, so we are reverting it
for now.
In this update we also have the following fix for -rt:
fb6271a942b5 intel: Remove the standard ktype nesting
(From OE-Core rev: 57a82d3bf0bf34bba9d0801057a4b8a6aa230228)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.14.bb | 16 |
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 1a756ecb3f..fba32450fc 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 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" | |||
3 | 3 | ||
4 | require recipes-kernel/linux/linux-yocto.inc | 4 | require recipes-kernel/linux/linux-yocto.inc |
5 | 5 | ||
6 | SRCREV_machine ?= "1f000ea7a3aed269c78a8650672f05ff2447feb5" | 6 | SRCREV_machine ?= "546062dedb3339ef1932e01a5639f2448c04cc8a" |
7 | SRCREV_machine_qemuppc ?= "01a649de749d9e82291063bd23301a6e7530e100" | 7 | SRCREV_machine_qemuppc ?= "93fc25319476f21750eb6c1e94978cad963c4bd7" |
8 | SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a" | 8 | SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" |
9 | 9 | ||
10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 10 | SRC_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 7b6d0e0f64..ca541c1161 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.19" | |||
8 | 8 | ||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | 10 | ||
11 | SRCREV_machine ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8" | 11 | SRCREV_machine ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8" |
12 | SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a" | 12 | SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" |
13 | 13 | ||
14 | PV = "${LINUX_VERSION}+git${SRCPV}" | 14 | PV = "${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 7ef71f3e20..365a70fd9a 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" | |||
10 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" | 10 | KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" |
11 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 11 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
12 | 12 | ||
13 | SRCREV_machine_qemuarm ?= "c21684fb4fad62bceafcc97ae592d1d1bd52cf36" | 13 | SRCREV_machine_qemuarm ?= "0ed31872de2c0e62e9843fa714cb0f8e5f53b70c" |
14 | SRCREV_machine_qemumips ?= "626a3a63414413e652daf3288903a58973d34520" | 14 | SRCREV_machine_qemumips ?= "c3537ecd101c8494a1da5534ad934f25d6fa256e" |
15 | SRCREV_machine_qemuppc ?= "a5e37ff008b4bf2c0cb573f54376cb8b48a79016" | 15 | SRCREV_machine_qemuppc ?= "df6daa113d535fd46668ba3bb0970c959f103f76" |
16 | SRCREV_machine_qemux86 ?= "a39fd81fa54776b2ac8c288251846890c3124dee" | 16 | SRCREV_machine_qemux86 ?= "1d678e0d4ecd53b973a70fb087dc1275b4de4e0c" |
17 | SRCREV_machine_qemux86-64 ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8" | 17 | SRCREV_machine_qemux86-64 ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8" |
18 | SRCREV_machine_qemumips64 ?= "c14d3c68c725205a5724cffe9f6f688d1bc38b6e" | 18 | SRCREV_machine_qemumips64 ?= "6aa17794bc6795847dae3b60f9d9be01dac874ec" |
19 | SRCREV_machine ?= "dbe5b52e93ff114b2c0f5da6f6af91f52c18f2b8" | 19 | SRCREV_machine ?= "0ca8f6b51728ca26129b4260be388ef2b7f366a8" |
20 | SRCREV_meta ?= "0bd3ec19b64191efc9d0ba83d05c9f7f9bf4473a" | 20 | SRCREV_meta ?= "fb6271a942b57bdc40c6e49f0203be153699f81c" |
21 | 21 | ||
22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
23 | 23 | ||