summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2015-11-19 15:18:08 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-01 21:32:12 +0000
commitbd29006d2396cd1e22539adbae58a69217cf2977 (patch)
tree45d9d24e3dc4b124b61de9caa6363ea803c7aa09
parent55614076fbfd267d81ab8110a4f5c30779ac6f76 (diff)
downloadpoky-bd29006d2396cd1e22539adbae58a69217cf2977.tar.gz
linux-yocto/4.1: update to v4.1.13
Updating the 4.1 kernel to the latest stable (and resolving minor conflicts with -rt). (From OE-Core rev: 12be8565b16f0fb571f859d3ef256767feaafc7f) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.1.bb20
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
index 4209a9640a..412691501b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -2,13 +2,13 @@ KBRANCH ?= "standard/preempt-rt/base"
2 2
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5SRCREV_machine ?= "f7e4bbfef684e29b1257eaf2d7f534b38e2e1b1e" 5SRCREV_machine ?= "a4b5d54fc4fc0e2b3035642559279a27c57a3391"
6SRCREV_meta ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b" 6SRCREV_meta ?= "1fb60461e4522bba62b4b34e9520128c959d2437"
7 7
8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 8SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 9 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
10 10
11LINUX_VERSION ?= "4.1.8" 11LINUX_VERSION ?= "4.1.13"
12 12
13PV = "${LINUX_VERSION}+git${SRCPV}" 13PV = "${LINUX_VERSION}+git${SRCPV}"
14 14
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
index 9862006bb8..69bfbad0da 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig"
4 4
5require recipes-kernel/linux/linux-yocto.inc 5require recipes-kernel/linux/linux-yocto.inc
6 6
7LINUX_VERSION ?= "4.1.8" 7LINUX_VERSION ?= "4.1.13"
8 8
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 12SRCREV_machine ?= "49e2f2d48ac2bb3f0fc379ee87651a2eaeab2cc7"
13SRCREV_meta ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b" 13SRCREV_meta ?= "1fb60461e4522bba62b4b34e9520128c959d2437"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
index a04c93097e..4f4e6ad148 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "bc11ecf659e30c8687604e086450ae1ff90c0169" 14SRCREV_machine_qemuarm ?= "52340eea58baf03f41f0b0a9410d8e6038e3124a"
15SRCREV_machine_qemuarm64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 15SRCREV_machine_qemuarm64 ?= "49e2f2d48ac2bb3f0fc379ee87651a2eaeab2cc7"
16SRCREV_machine_qemumips ?= "181e2c553ffaae19d08a6730e98d288c7e337d39" 16SRCREV_machine_qemumips ?= "f821004dd2dae30004c54b2d2ec2563aee11be8a"
17SRCREV_machine_qemuppc ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 17SRCREV_machine_qemuppc ?= "49e2f2d48ac2bb3f0fc379ee87651a2eaeab2cc7"
18SRCREV_machine_qemux86 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 18SRCREV_machine_qemux86 ?= "49e2f2d48ac2bb3f0fc379ee87651a2eaeab2cc7"
19SRCREV_machine_qemux86-64 ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 19SRCREV_machine_qemux86-64 ?= "49e2f2d48ac2bb3f0fc379ee87651a2eaeab2cc7"
20SRCREV_machine_qemumips64 ?= "2684711a16ed21f114d834742f860cee532f7438" 20SRCREV_machine_qemumips64 ?= "0cf340000b9c2b91d1086d4c34f88eecfc257562"
21SRCREV_machine ?= "dbe692d91c8e55d1430f2c45fd578c8e4e71e482" 21SRCREV_machine ?= "49e2f2d48ac2bb3f0fc379ee87651a2eaeab2cc7"
22SRCREV_meta ?= "aed902160251d69cc28d1e69a4f692e8ea8fa13b" 22SRCREV_meta ?= "1fb60461e4522bba62b4b34e9520128c959d2437"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
26 26
27LINUX_VERSION ?= "4.1.8" 27LINUX_VERSION ?= "4.1.13"
28 28
29PV = "${LINUX_VERSION}+git${SRCPV}" 29PV = "${LINUX_VERSION}+git${SRCPV}"
30 30