summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2016-10-03 05:54:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-08 23:47:13 (GMT)
commit49de8caab018b76f12998d4ff1e2f6cd954a0b4e (patch)
tree26e52bc46d97882687f177f7e664fc0af7af6ff1
parentd672a4cc3c0465d0e013b5742bdebe2d8a191c2f (diff)
downloadpoky-49de8caab018b76f12998d4ff1e2f6cd954a0b4e.tar.gz
linux-yocto/4.1: update to 4.1.33
(From OE-Core rev: af4e9d92ae23f0e668da4732ef79cd1f1bb6fc1f) (From OE-Core rev: 81b67e1de7ba8f91f9a73ee274796ee685cf2e90) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Hand applied to manage merge conflicts. Signed-off-by: Armin Kuster <akuster808@gmail.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 ce54fc5..77f1f1b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb
@@ -11,13 +11,13 @@ python () {
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "e22280e8c2905d96c7cc5917df202b6ed904d042" 14SRCREV_machine ?= "3389720cf9809d517de7188308132ef1ec066e55"
15SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" 15SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}"
19 19
20LINUX_VERSION ?= "4.1.24" 20LINUX_VERSION ?= "4.1.33"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
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 2eea7b8..c57949b 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.24" 7LINUX_VERSION ?= "4.1.33"
8 8
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" 12SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
13SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" 13SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
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 dd2ef76..b2ebe8b 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 ?= "cadb80aa4bcee282f1b0798ef35ad8b96ec44931" 14SRCREV_machine_qemuarm ?= "a8169bc7216752813a0a8be7d77ec8fcf0d8850e"
15SRCREV_machine_qemuarm64 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" 15SRCREV_machine_qemuarm64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
16SRCREV_machine_qemumips ?= "737eda6388a529d0937e9d91daa3644b11f322dc" 16SRCREV_machine_qemumips ?= "d12861e340503a14614b655e77d8dcabadb18f8e"
17SRCREV_machine_qemuppc ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" 17SRCREV_machine_qemuppc ?= "0e7c356e7c972e0f6f596d7d5f2621a3f68df8e4"
18SRCREV_machine_qemux86 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" 18SRCREV_machine_qemux86 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
19SRCREV_machine_qemux86-64 ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" 19SRCREV_machine_qemux86-64 ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
20SRCREV_machine_qemumips64 ?= "f276d128428b031521d766bfbfe84f9f9f992930" 20SRCREV_machine_qemumips64 ?= "c14be1d25b733ff6ff47e8f255e8196cf9b3e8c9"
21SRCREV_machine ?= "403eda4633e9037fb715d0d1e8ae847b2bd0651a" 21SRCREV_machine ?= "0c7be943fb59eb9a8d1e57e1fb1aa20aed5fa9cb"
22SRCREV_meta ?= "d6e1f4bfc254c677a8dfef92f0ad8c78bdeeea75" 22SRCREV_meta ?= "322fa5b2796bfcff7bfbbde1d76c73636ecf5857"
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.24" 27LINUX_VERSION ?= "4.1.33"
28 28
29PV = "${LINUX_VERSION}+git${SRCPV}" 29PV = "${LINUX_VERSION}+git${SRCPV}"
30 30