diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-12-21 10:49:13 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-21 16:26:52 +0000 |
commit | ecc393e08f42b39525121896b148d57af0e3131e (patch) | |
tree | 5800b44c5c80beb54bf06b8bf7e15162c7098449 /meta/recipes-kernel | |
parent | fd7903efd464ff832aa3d4306b9235916ade6d8b (diff) | |
download | poky-ecc393e08f42b39525121896b148d57af0e3131e.tar.gz |
linux-yocto/4.12: bug fixes and VRF feature addition
Integrating two bug fixes (functionality regressions):
1d685baca196 iwlwifi: bump max FW API to 31
cb8ce8c4ad0f tty: fix __tty_insert_flip_char regression
And the following configuration fragment:
vrf: Add feature
(From OE-Core rev: f4c7a52e6bd4e955ee6aface617d84b15356bd31)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.12.bb | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb index 6431ffbfe3..adbb0ccbad 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.12.bb | |||
@@ -11,8 +11,8 @@ 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 ?= "1a58be8c58386b680d6086ca527acf5c6d173a74" | 14 | SRCREV_machine ?= "82dfc739621af193e6b5cb8f27f55c66db8e631b" |
15 | SRCREV_meta ?= "146a863c246f803a074a5abc12e69737bc6751b2" | 15 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb index 2e74995065..4e18d413ce 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.12.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.12.16" | |||
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 ?= "42a33c00cd35d9de9566488bcedd01d9c6b0ab03" | 12 | SRCREV_machine ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" |
13 | SRCREV_meta ?= "146a863c246f803a074a5abc12e69737bc6751b2" | 13 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" |
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.12.bb b/meta/recipes-kernel/linux/linux-yocto_4.12.bb index 20e2fd3795..0df702e470 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.12.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.12.bb | |||
@@ -11,15 +11,15 @@ 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 ?= "d28b66327c41ded21f49bd1b4bf35e8d3a5684c3" | 14 | SRCREV_machine_qemuarm ?= "9f857972035c7e3ae237d25a581eb695ffe78249" |
15 | SRCREV_machine_qemuarm64 ?= "42a33c00cd35d9de9566488bcedd01d9c6b0ab03" | 15 | SRCREV_machine_qemuarm64 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" |
16 | SRCREV_machine_qemumips ?= "2e6d1d8f4d63400aac07dcadfd94c1337d4b7e2f" | 16 | SRCREV_machine_qemumips ?= "6527cf00278f043ba8f874ac7262261dd57e9a79" |
17 | SRCREV_machine_qemuppc ?= "42a33c00cd35d9de9566488bcedd01d9c6b0ab03" | 17 | SRCREV_machine_qemuppc ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" |
18 | SRCREV_machine_qemux86 ?= "42a33c00cd35d9de9566488bcedd01d9c6b0ab03" | 18 | SRCREV_machine_qemux86 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" |
19 | SRCREV_machine_qemux86-64 ?= "42a33c00cd35d9de9566488bcedd01d9c6b0ab03" | 19 | SRCREV_machine_qemux86-64 ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" |
20 | SRCREV_machine_qemumips64 ?= "5ad067fb6b042cc68252ba746a244d7a97be75fc" | 20 | SRCREV_machine_qemumips64 ?= "ad347d33914f66c4b2aa6fca0c9f0a92773885cc" |
21 | SRCREV_machine ?= "42a33c00cd35d9de9566488bcedd01d9c6b0ab03" | 21 | SRCREV_machine ?= "1d685baca196583254d75f5cc7bc0ffedb8753ad" |
22 | SRCREV_meta ?= "146a863c246f803a074a5abc12e69737bc6751b2" | 22 | SRCREV_meta ?= "e3c9041f48ae980cc4461f969d0e3ed9bb43be5b" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.12.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.12;destsuffix=${KMETA}" |