diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-12-10 04:20:19 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-20 11:24:05 +0000 |
| commit | a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c (patch) | |
| tree | 996086581f9d67f78a9586c3f50ddfdaf78f4417 /meta/recipes-kernel/linux | |
| parent | 4408bfc7dd0fd2223791cb5da706dde986f4ddef (diff) | |
| download | openembedded-core-a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c.tar.gz openembedded-core-a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c.tar.bz2 openembedded-core-a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c.zip | |
linux-yocto/3.10: update to v3.10.62
Updating to the latest korg -stable update for the 3.10 series. Minor
merge conflict resolution was done with the standard/ltsi and
standard/preempt-rt branches.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta/recipes-kernel/linux')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 |
3 files changed, 16 insertions, 16 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 91b37d3c19..8acbd2e59b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb @@ -3,13 +3,13 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "38885f87b7240587194597c3658ba2c0ac5960e7" -SRCREV_machine_qemuppc ?= "535a7403beabe9c4aa394a1f9efa755eb33966c8" -SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" +SRCREV_machine ?= "94a79d98e40b51466600fb3375ad2908c38dd192" +SRCREV_machine_qemuppc ?= "c1dcbac7751652784f180fdb91f87bc37fba8c52" +SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" -LINUX_VERSION ?= "3.10.59" +LINUX_VERSION ?= "3.10.62" PV = "${LINUX_VERSION}+git${SRCPV}" 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 cc70388302..9ea81b8874 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb @@ -5,12 +5,12 @@ require recipes-kernel/linux/linux-yocto.inc LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.10.59" +LINUX_VERSION ?= "3.10.62" KMETA = "meta" -SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" +SRCREV_machine ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb index 043f2e0b23..978775a7d3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb @@ -10,18 +10,18 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "896f87d1003331d7a307c9f855cdbb78c9a2a033" -SRCREV_machine_qemumips ?= "9e616945464ab97a050da96a025d88c809d05144" -SRCREV_machine_qemuppc ?= "692b2de590668de2e15461879cf9301a0e6fedf6" -SRCREV_machine_qemux86 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_machine_qemux86-64 ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_machine_qemumips64 ?= "d237cab9f483ea512ded4ea311902763c1a3ae68" -SRCREV_machine ?= "747e1cbd12b15db8bc2ae86e2359c1b113f120d6" -SRCREV_meta ?= "8f05306a8e6f5ee422d50c3317acce0cf9e6aada" +SRCREV_machine_qemuarm ?= "f6b075991c91b7c2bb641b389757863e2fd34b8c" +SRCREV_machine_qemumips ?= "48afdc632312b6cc26fe7bca151cfb66b2ebc308" +SRCREV_machine_qemuppc ?= "cf35ea9ac92153858dadd2f4ab71cccd3a1fa26b" +SRCREV_machine_qemux86 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_machine_qemux86-64 ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_machine_qemumips64 ?= "ebdb374ca5130ef456d0baf75b6fe7a242932d0d" +SRCREV_machine ?= "b2ac933df119a3444a32fcccf5e4ad453f5ac89d" +SRCREV_meta ?= "f4ab00d96a3d8e443d7f7744ad996e184eac03b5" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -LINUX_VERSION ?= "3.10.59" +LINUX_VERSION ?= "3.10.62" PV = "${LINUX_VERSION}+git${SRCPV}" |