diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-12-10 04:22:10 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-20 11:24:05 +0000 |
| commit | 8c30cec8233605cbec334fcc5c2b9ef5cf8f6482 (patch) | |
| tree | 98ead9f6c6cf5c3036953bc2760bd3acc956739e /meta | |
| parent | a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c (diff) | |
| download | openembedded-core-8c30cec8233605cbec334fcc5c2b9ef5cf8f6482.tar.gz openembedded-core-8c30cec8233605cbec334fcc5c2b9ef5cf8f6482.tar.bz2 openembedded-core-8c30cec8233605cbec334fcc5c2b9ef5cf8f6482.zip | |
linux-yocto/3.14: update to 3.14.26, integrate ltsi and -rt updates
Updating the 3.14 tree to the latest korg 3.14.26, as well as
integrating 3.14 LTSI content, and refreshing preempt-rt. Minor
conflict resolutions were performed between ltsi, stable and -rt
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
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 fc86725806..7dbf82c3e6 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" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "baad552ea168dc31db31f0be188edefaa28a4aec" -SRCREV_machine_qemuppc ?= "db4221ed2e1c6c617ad07d3374f630bbb59cf8b5" -SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" +SRCREV_machine ?= "7f0712d10247ffca8e48e944f49707bcf9117ead" +SRCREV_machine_qemuppc ?= "8bed2a975d491c963cff56496f7e35f5bcff926f" +SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 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 d168a2acbb..67bf4624f8 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.24" KMETA = "meta" -SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" -SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" +SRCREV_machine ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" +SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index c30227e160..706cb7ce9c 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" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "b768ebfe28a20b65aba734b9f6646a3fa0adc89b" -SRCREV_machine_qemumips ?= "c76146e6c8a015c1225141fc55d867a3e47453c6" -SRCREV_machine_qemuppc ?= "e54ab8451c482b695ff7a0c580ef2fb1be605299" -SRCREV_machine_qemux86 ?= "146fcb1dd7b3c5547d67f04d50b082f0723741e9" -SRCREV_machine_qemux86-64 ?= "c100e8665052051487a17169748c457829d3f88c" -SRCREV_machine_qemumips64 ?= "71621ee758600abd3cf7187d7a8e7d51f4052c53" -SRCREV_machine ?= "c100e8665052051487a17169748c457829d3f88c" -SRCREV_meta ?= "fba2d0cdb745e0f807ce134fd9d1524b7bed9742" +SRCREV_machine_qemuarm ?= "6166316d47b859aa38bfecc61f4808828af03937" +SRCREV_machine_qemumips ?= "4ececcc09c6550a0896728163907e729d817c2fd" +SRCREV_machine_qemuppc ?= "1cc5b09f8bb7f40b289d149d370c62dcc8109501" +SRCREV_machine_qemux86 ?= "38cd560d5022ed2dbd1ab0dca9642e47c98a0aa1" +SRCREV_machine_qemux86-64 ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" +SRCREV_machine_qemumips64 ?= "737272b1dfd361d9ea19812a9717e2798e3c4576" +SRCREV_machine ?= "02120556b0ebc20c30374ccf211e8e4ceac2bb1c" +SRCREV_meta ?= "a227f20eff056e511d504b2e490f3774ab260d6f" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |