diff options
| author |   Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-01-18 00:19:31 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-18 13:20:42 +0000 |
| commit | 8f03ebe9b164e0c0493c56d9eb2e7d0b039832f1 (patch) | |
| tree | 9bde7c1c162f5811aa389266c55c6c83ab867ad6 /meta/recipes-kernel/linux | |
| parent | 9a5948ff07b62f54d6215d37e9028384d3b430da (diff) | |
| download | openembedded-core-8f03ebe9b164e0c0493c56d9eb2e7d0b039832f1.tar.gz | |
linux-yocto/3.4: integrate LTSI-3.4
Updating the linux-yocto-3.4 SRCREVS to activate the merge of the 3.4.25-ltsi
tree:
http://git.linuxfoundation.org/?p=ltsi-kernel.git;a=tag;h=refs/tags/v3.4.25-ltsi
The pristine patch queue can be seen on the "ltsi" branch in the repository.
This branch has been merged into the standard/base branch of linux-yocto-3.4
and to all BSP branches in the tree.
LTSI based BSPs or features are not activated as part of this commit, they
are controlled by the meta branch of the kernel repository and are activated
in separate patches.
[YOCTO #2396]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux')
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb index bcac39530b..25e9a10f84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb @@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt" KMETA = "meta" -SRCREV_machine ?= "729e8634f75bf10582916eae6b5b96325785c001" -SRCREV_machine_qemuppc ?= "15ce18fac50c49ea4893b0d7ed3d0086ef9c7448" +SRCREV_machine ?= "086782fe576d96cda54068a2248c697a9f1946c6" +SRCREV_machine_qemuppc ?= "4a3d7cbda063ece64ba286749e23bfd4b81831b8" SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" PR = "${INC_PR}.0" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb index 984476fba7..17eb6dde88 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb @@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.4.24" KMETA = "meta" -SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" +SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" PR = "${INC_PR}.0" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 0ac51b904c..62eb4be70d 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb @@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc KBRANCH_DEFAULT = "standard/base" KBRANCH = "${KBRANCH_DEFAULT}" -SRCREV_machine_qemuarm ?= "50986c7d971c28505acdbdcab6601f4d5b6dbff4" -SRCREV_machine_qemumips ?= "4d355c57fe0d9f117c272f1679fa3d3f451a8c8e" -SRCREV_machine_qemuppc ?= "1c8a1aa8cc839f0328edbfe0d755100368bc4ae6" -SRCREV_machine_qemux86 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" -SRCREV_machine_qemux86-64 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" -SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" +SRCREV_machine_qemuarm ?= "2ed05c280920e592f62d09bda15ab006baffa996" +SRCREV_machine_qemumips ?= "81ef4ad8f02c979a236a460c6831dcb4fbf2ef3c" +SRCREV_machine_qemuppc ?= "6b5d5a60ca6c3cf05d28c9ad447c133563340232" +SRCREV_machine_qemux86 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" +SRCREV_machine_qemux86-64 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" +SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |