diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-07-27 12:57:06 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:20 +0100 |
commit | 453c174e412605b3990d9ef4b6551320a0d98bd8 (patch) | |
tree | 78ce3773c587944650325dd64ddfa6fca6def5ae /meta | |
parent | 9dc4cfc54d59f7ac88bf680aafe7da41b93c6220 (diff) | |
download | poky-453c174e412605b3990d9ef4b6551320a0d98bd8.tar.gz |
linux-yocto/4.1: bug fixes and configuration changes
Integrating the following two commits:
44af90071620 4.1.28 Fix bad backport of 8f182270dfec "mm/swap.c: flush lru pvecs on compound page arrival"
99c37e1500a6 i2c: ismt: Add Intel DNV PCI ID
And the following two meta-data changes:
afbc6bd00e6f bsp/axxiaarm64: Enable Axxia NCR and PEI drivers
6a2047c00450 common-pc: enforce 32 bit
(From OE-Core rev: d52e523b28cc95a741039018d76fa4c1a947a40f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 18 |
3 files changed, 13 insertions, 13 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 3be43fe238..49157902ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.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 ?= "cb1593933f5defcebb668a1ca655a24394b9c27e" | 14 | SRCREV_machine ?= "0b68498784da5defb7658675e37d9bc615cd4c50" |
15 | SRCREV_meta ?= "98729aff41208eed09dc232254d7a1305237fdbe" | 15 | SRCREV_meta ?= "afbc6bd00e6fa854ae10eb67ab8c3be5112f6f41" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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}" |
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 41a0bb089a..9187f85429 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.1.28" | |||
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 ?= "846e0a90dd228d07272bf5b246aab405ec6941f8" | 12 | SRCREV_machine ?= "44af900716206d4cae283aa74e92f4118720724a" |
13 | SRCREV_meta ?= "98729aff41208eed09dc232254d7a1305237fdbe" | 13 | SRCREV_meta ?= "afbc6bd00e6fa854ae10eb67ab8c3be5112f6f41" |
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.1.bb b/meta/recipes-kernel/linux/linux-yocto_4.1.bb index 248faf892e..fb10f40811 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.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 ?= "aa956be29cf5247a0870728b177ae056bc9f62be" | 14 | SRCREV_machine_qemuarm ?= "460340f28dd4ed608fd66692bcbac0bb24fe4aaf" |
15 | SRCREV_machine_qemuarm64 ?= "846e0a90dd228d07272bf5b246aab405ec6941f8" | 15 | SRCREV_machine_qemuarm64 ?= "44af900716206d4cae283aa74e92f4118720724a" |
16 | SRCREV_machine_qemumips ?= "931c8308f3327ea0a882349321989be6db3b22a9" | 16 | SRCREV_machine_qemumips ?= "9b9337aa156bd3bcf3e813455e4bbdc2895c4da1" |
17 | SRCREV_machine_qemuppc ?= "846e0a90dd228d07272bf5b246aab405ec6941f8" | 17 | SRCREV_machine_qemuppc ?= "44af900716206d4cae283aa74e92f4118720724a" |
18 | SRCREV_machine_qemux86 ?= "846e0a90dd228d07272bf5b246aab405ec6941f8" | 18 | SRCREV_machine_qemux86 ?= "44af900716206d4cae283aa74e92f4118720724a" |
19 | SRCREV_machine_qemux86-64 ?= "846e0a90dd228d07272bf5b246aab405ec6941f8" | 19 | SRCREV_machine_qemux86-64 ?= "44af900716206d4cae283aa74e92f4118720724a" |
20 | SRCREV_machine_qemumips64 ?= "33eebd8a461ae8c619ece37a1de02e48893e0b12" | 20 | SRCREV_machine_qemumips64 ?= "cb03bb92ed4d45c55e7a8ecfcca714f9897da96b" |
21 | SRCREV_machine ?= "846e0a90dd228d07272bf5b246aab405ec6941f8" | 21 | SRCREV_machine ?= "44af900716206d4cae283aa74e92f4118720724a" |
22 | SRCREV_meta ?= "98729aff41208eed09dc232254d7a1305237fdbe" | 22 | SRCREV_meta ?= "afbc6bd00e6fa854ae10eb67ab8c3be5112f6f41" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_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}" |