diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-10 11:12:32 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-10 17:35:16 +0100 |
commit | 4c6d49fe14f2e0397ed5427079f2f64d4b878162 (patch) | |
tree | 1c56266fc5d31b96a5da35b664d790a2a0f0c994 | |
parent | 0c282b6d5391579c39e8e3df2159337a2c4846a4 (diff) | |
download | poky-4c6d49fe14f2e0397ed5427079f2f64d4b878162.tar.gz |
linux-yocto/3.4: update to v3.4.85
Updating the SRCREVs to integrate the latest korg -stable update.
(From OE-Core rev: c6fe4b287c204d31a9ab86e3f38336d8828903ee)
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.4.bb | 8 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 16 |
3 files changed, 15 insertions, 15 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 dfe11e4925..dc3813ca6d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | |||
@@ -3,14 +3,14 @@ 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 | LINUX_VERSION ?= "3.4.82" | 6 | LINUX_VERSION ?= "3.4.85" |
7 | LINUX_KERNEL_TYPE = "preempt-rt" | 7 | LINUX_KERNEL_TYPE = "preempt-rt" |
8 | 8 | ||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | 10 | ||
11 | SRCREV_machine ?= "74369c14c79dbb546ce1e387b1363e808ea4f5b1" | 11 | SRCREV_machine ?= "fd1626cc2a1144a7760bcfc9c6e48a14de28624e" |
12 | SRCREV_machine_qemuppc ?= "71694a302cda24cc8a7c5f772e8306111ffcfb6c" | 12 | SRCREV_machine_qemuppc ?= "605cdff89f2d36d44ebfc75d6427eea5f236a940" |
13 | SRCREV_meta ?= "ef4cd500d4b64680f7a319d399b8a12f9ecc9fe6" | 13 | SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e" |
14 | 14 | ||
15 | PR = "${INC_PR}.1" | 15 | PR = "${INC_PR}.1" |
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
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 7db9099fec..f22a3f46a0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | |||
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}" | |||
8 | LINUX_KERNEL_TYPE = "tiny" | 8 | LINUX_KERNEL_TYPE = "tiny" |
9 | KCONFIG_MODE = "--allnoconfig" | 9 | KCONFIG_MODE = "--allnoconfig" |
10 | 10 | ||
11 | LINUX_VERSION ?= "3.4.82" | 11 | LINUX_VERSION ?= "3.4.85" |
12 | 12 | ||
13 | KMETA = "meta" | 13 | KMETA = "meta" |
14 | 14 | ||
15 | SRCREV_machine ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb" | 15 | SRCREV_machine ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" |
16 | SRCREV_meta ?= "ef4cd500d4b64680f7a319d399b8a12f9ecc9fe6" | 16 | SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e" |
17 | 17 | ||
18 | PR = "${INC_PR}.1" | 18 | PR = "${INC_PR}.1" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 878422985b..3a2ff2f504 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
@@ -11,17 +11,17 @@ KBRANCH_qemux86 = "standard/common-pc/base" | |||
11 | KBRANCH_qemux86-64 = "standard/common-pc-64/base" | 11 | KBRANCH_qemux86-64 = "standard/common-pc-64/base" |
12 | KBRANCH_qemumips64 = "standard/mti-malta64" | 12 | KBRANCH_qemumips64 = "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "6c34763a9e4e05e1fcaa32d915bd05cccd0abc1d" | 14 | SRCREV_machine_qemuarm ?= "64f9a290683b1ab08136ef5d54d1845a961a6940" |
15 | SRCREV_machine_qemumips ?= "fa9377eda8d2dceccb218f229551424c64ef0c28" | 15 | SRCREV_machine_qemumips ?= "ad7aa3ecf8ab00055d31c3f7b059c8b8a8633e19" |
16 | SRCREV_machine_qemuppc ?= "85868d48f06911b7dddaf0180af96c8f2e874922" | 16 | SRCREV_machine_qemuppc ?= "7aaa5a4debe4b1987d2d11707313e682b185e876" |
17 | SRCREV_machine_qemux86 ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb" | 17 | SRCREV_machine_qemux86 ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" |
18 | SRCREV_machine_qemux86-64 ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb" | 18 | SRCREV_machine_qemux86-64 ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" |
19 | SRCREV_machine ?= "c29f5c8952c0f3ef27773d78e5cc64e437a357cb" | 19 | SRCREV_machine ?= "95a3ff6e3c2eec2fafe9d1813048fcdb468a678e" |
20 | SRCREV_meta ?= "ef4cd500d4b64680f7a319d399b8a12f9ecc9fe6" | 20 | SRCREV_meta ?= "7c9e1e0117e7ca1f7451870dad5db50adc21732e" |
21 | 21 | ||
22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 22 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
23 | 23 | ||
24 | LINUX_VERSION ?= "3.4.82" | 24 | LINUX_VERSION ?= "3.4.85" |
25 | 25 | ||
26 | PR = "${INC_PR}.5" | 26 | PR = "${INC_PR}.5" |
27 | PV = "${LINUX_VERSION}+git${SRCPV}" | 27 | PV = "${LINUX_VERSION}+git${SRCPV}" |