diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-10-03 01:54:32 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-08 23:47:13 +0000 |
commit | ca9d26a08dffeeeffee1447f462d4a2361397aa8 (patch) | |
tree | ec690f8fe9cc11f3a6a425a70aa245171495464c | |
parent | 49de8caab018b76f12998d4ff1e2f6cd954a0b4e (diff) | |
download | poky-ca9d26a08dffeeeffee1447f462d4a2361397aa8.tar.gz |
linux-yocto/4.4: update to v4.4.22
(From OE-Core rev: 286d893f9e7caed06035f7916492a74e0212df6a)
(From OE-Core rev: 3865d4cfe00e8e1ee2b84e742f154ff0c994a253)
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.4.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.4.bb | 20 |
3 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index 1b9d80ae13..5416ca499b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.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 | ||
14 | SRCREV_machine ?= "bf2fbe7f2cdf44fc69e50fefbfdd58d41a03733a" | 14 | SRCREV_machine ?= "a1da5707fd13f31d25661b910c7377c8714c1123" |
15 | SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" | 15 | SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" |
19 | 19 | ||
20 | LINUX_VERSION ?= "4.4.11" | 20 | LINUX_VERSION ?= "4.4.22" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index da88451b76..e7e48adc4d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | |||
@@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" | |||
4 | 4 | ||
5 | require recipes-kernel/linux/linux-yocto.inc | 5 | require recipes-kernel/linux/linux-yocto.inc |
6 | 6 | ||
7 | LINUX_VERSION ?= "4.4.11" | 7 | LINUX_VERSION ?= "4.4.22" |
8 | 8 | ||
9 | KMETA = "kernel-meta" | 9 | KMETA = "kernel-meta" |
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "628bf627561c6285d99fb978e11d4c15fc29324b" | 12 | SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" |
13 | SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" | 13 | SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 4306bf8be9..5cafa9166a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb | |||
@@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" | |||
11 | KBRANCH_qemux86-64 ?= "standard/base" | 11 | KBRANCH_qemux86-64 ?= "standard/base" |
12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" | 12 | KBRANCH_qemumips64 ?= "standard/mti-malta64" |
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "97c21d0b5ffa8eb1cb27a6f81b52ec53182ae087" | 14 | SRCREV_machine_qemuarm ?= "22a817dc851fac7ec9369c29b3a2803ec92781fb" |
15 | SRCREV_machine_qemuarm64 ?= "628bf627561c6285d99fb978e11d4c15fc29324b" | 15 | SRCREV_machine_qemuarm64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" |
16 | SRCREV_machine_qemumips ?= "8763860e4da46b3cb1551e09d9ca46eedd2dd91a" | 16 | SRCREV_machine_qemumips ?= "c1794372ab031297d1c4482d982e143386c247ea" |
17 | SRCREV_machine_qemuppc ?= "628bf627561c6285d99fb978e11d4c15fc29324b" | 17 | SRCREV_machine_qemuppc ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" |
18 | SRCREV_machine_qemux86 ?= "628bf627561c6285d99fb978e11d4c15fc29324b" | 18 | SRCREV_machine_qemux86 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" |
19 | SRCREV_machine_qemux86-64 ?= "628bf627561c6285d99fb978e11d4c15fc29324b" | 19 | SRCREV_machine_qemux86-64 ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" |
20 | SRCREV_machine_qemumips64 ?= "8974d9741cbcb21bf50ab49a6257e5773415fa5f" | 20 | SRCREV_machine_qemumips64 ?= "ab08db0be1aec0daa5ac134fe1abcd6eba47b275" |
21 | SRCREV_machine ?= "628bf627561c6285d99fb978e11d4c15fc29324b" | 21 | SRCREV_machine ?= "0ef03dcfb96805e6bcf82989f1c8fed1b488d00a" |
22 | SRCREV_meta ?= "6ec93aaa70f838b551f58b91d0c6ffeff6f6094b" | 22 | SRCREV_meta ?= "170ed03a9d908e2abc8025cf9a62789ab15b3ece" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" |
26 | 26 | ||
27 | LINUX_VERSION ?= "4.4.11" | 27 | LINUX_VERSION ?= "4.4.22" |
28 | 28 | ||
29 | PV = "${LINUX_VERSION}+git${SRCPV}" | 29 | PV = "${LINUX_VERSION}+git${SRCPV}" |
30 | 30 | ||