diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-11-26 12:33:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-30 22:26:29 +0000 |
commit | 04e3487b4a7aa2fdb965709d24ee36015d1ef516 (patch) | |
tree | 1618ab0aab5a034177bd35980827788e5c1cae60 | |
parent | 8bd91ec328bd85e9b1a22095e72c656dcfbcc493 (diff) | |
download | poky-04e3487b4a7aa2fdb965709d24ee36015d1ef516.tar.gz |
linux-yocto/3.10: -rt, ebtables and e1000 fixes
Updating the 3.10 SRCREVs for the following fixes:
f47ea28 bridge: enable EBTABLES
a9ec82e e1000: prevent oops when adapter is being closed and reset simultaneously
a4e1bd7 Revert "arm: add dummy swizzle for versatile with qemu"
(From OE-Core rev: 20139a693677c23324c89c963735f3b8c18eeb84)
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.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.10.bb | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb index d040e3e195..d9c5afa3af 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | |||
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH = "standard/preempt-rt/base" | 3 | KBRANCH = "standard/preempt-rt/base" |
4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" | 4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" |
5 | 5 | ||
6 | SRCREV_machine ?= "a9b2df9bd27b137408d627ce1f75f1177eae647e" | 6 | SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0" |
7 | SRCREV_machine_qemuppc ?= "601746ed79b7ccc79e31166dea9b2906c915a7e3" | 7 | SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290" |
8 | SRCREV_meta ?= "41072c6288b1ab468670ebf7b3d411fbc177317c" | 8 | SRCREV_meta ?= "f47ea2844543c8ebf4572cfe23e4cfd6cb94d887" |
9 | 9 | ||
10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" | 10 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" |
11 | 11 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb index 0939ce6473..a866421b5a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.10.19" | |||
9 | 9 | ||
10 | KMETA = "meta" | 10 | KMETA = "meta" |
11 | 11 | ||
12 | SRCREV_machine ?= "2d96adf459037aec2c0027503c3eddfc20de9ad4" | 12 | SRCREV_machine ?= "a9ec82e355130160f9094e670bd5be0022a84194" |
13 | SRCREV_meta ?= "41072c6288b1ab468670ebf7b3d411fbc177317c" | 13 | SRCREV_meta ?= "f47ea2844543c8ebf4572cfe23e4cfd6cb94d887" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index c678a8bfa2..d85c6c4829 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb | |||
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH_DEFAULT = "standard/base" | 3 | KBRANCH_DEFAULT = "standard/base" |
4 | KBRANCH = "${KBRANCH_DEFAULT}" | 4 | KBRANCH = "${KBRANCH_DEFAULT}" |
5 | 5 | ||
6 | SRCREV_machine_qemuarm ?= "9aac62bcd594648a7da61fa89e7da14eb2747e31" | 6 | SRCREV_machine_qemuarm ?= "7744145fcc3e4b6b6e308a1b86dc1c8b237b7575" |
7 | SRCREV_machine_qemumips ?= "141675948177bed049477ea53203dd0fc3c105c4" | 7 | SRCREV_machine_qemumips ?= "2b8e8c694c38729ce724facdb0ab20751d061a2e" |
8 | SRCREV_machine_qemuppc ?= "ebcaee076da19ffe0e317089566d22c199f16fad" | 8 | SRCREV_machine_qemuppc ?= "9a7537cb9bcc5c835dae6ac84fbbe7298473f69c" |
9 | SRCREV_machine_qemux86 ?= "2d96adf459037aec2c0027503c3eddfc20de9ad4" | 9 | SRCREV_machine_qemux86 ?= "a9ec82e355130160f9094e670bd5be0022a84194" |
10 | SRCREV_machine_qemux86-64 ?= "2d96adf459037aec2c0027503c3eddfc20de9ad4" | 10 | SRCREV_machine_qemux86-64 ?= "a9ec82e355130160f9094e670bd5be0022a84194" |
11 | SRCREV_machine_qemumips64 ?= "7acc7b9b44fb0b97a50e75387a11a24dfd5c242a" | 11 | SRCREV_machine_qemumips64 ?= "0cd8e958d0ec7e01fd21fc7891da7eed688b0d37" |
12 | SRCREV_machine ?= "2d96adf459037aec2c0027503c3eddfc20de9ad4" | 12 | SRCREV_machine ?= "a9ec82e355130160f9094e670bd5be0022a84194" |
13 | SRCREV_meta ?= "41072c6288b1ab468670ebf7b3d411fbc177317c" | 13 | SRCREV_meta ?= "f47ea2844543c8ebf4572cfe23e4cfd6cb94d887" |
14 | 14 | ||
15 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 15 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
16 | 16 | ||