diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-07-27 12:57:07 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-01 11:47:12 +0100 |
commit | e647fe0bff3e8318755842a293a2b2bdac8a2f7e (patch) | |
tree | ff914459c26b0b741af63bc1131e007861fbe0d8 /meta/recipes-kernel | |
parent | ec31f30a6ef14203d035d4a0da395f7dced1afc6 (diff) | |
download | poky-e647fe0bff3e8318755842a293a2b2bdac8a2f7e.tar.gz |
linux-yocto/4.4: lx-dialog and mei bug fixes
Integrating the following changes, that resolve issues with previous
functionality merges:
ddab24299940 mei: drop wr_msg from the mei_dev structure
26e282c0686e lx-dialog: fix merge issues
(From OE-Core rev: 84dbace51d86efcaa50c1b0cbc4d44ac884f26fc)
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>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.4.bb | 18 |
3 files changed, 12 insertions, 12 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 64b81496d2..ec573083c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" | 14 | SRCREV_machine ?= "3bdc347cc2087a0217e3acddccda5bb775cd570b" |
15 | SRCREV_meta ?= "8c6158ec5e43a4cae59058af49f70e0406d18091" | 15 | SRCREV_meta ?= "4789b41c5605189902d2c1a674f8616d41ee218d" |
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}" |
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 b32721ba5b..635d91ca3a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | |||
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.15" | |||
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 ?= "1238684aa5173dc6f431ad1b3c85a37830244824" | 12 | SRCREV_machine ?= "ddab242999407fadae68e7ee5381b0ec6679d443" |
13 | SRCREV_meta ?= "8c6158ec5e43a4cae59058af49f70e0406d18091" | 13 | SRCREV_meta ?= "4789b41c5605189902d2c1a674f8616d41ee218d" |
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 f68fdfa0f7..036a5b1550 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.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 ?= "75b02cc20216b6a068e1757a997f4e0d405d6ded" | 14 | SRCREV_machine_qemuarm ?= "c2507bd62854f90030433307a3d783474332f821" |
15 | SRCREV_machine_qemuarm64 ?= "1238684aa5173dc6f431ad1b3c85a37830244824" | 15 | SRCREV_machine_qemuarm64 ?= "ddab242999407fadae68e7ee5381b0ec6679d443" |
16 | SRCREV_machine_qemumips ?= "e656b69259deb08cfe6d606fb126b4c0810abf64" | 16 | SRCREV_machine_qemumips ?= "8d0a4875a93017329b32b42ce7d67b02f63a173b" |
17 | SRCREV_machine_qemuppc ?= "1238684aa5173dc6f431ad1b3c85a37830244824" | 17 | SRCREV_machine_qemuppc ?= "ddab242999407fadae68e7ee5381b0ec6679d443" |
18 | SRCREV_machine_qemux86 ?= "1238684aa5173dc6f431ad1b3c85a37830244824" | 18 | SRCREV_machine_qemux86 ?= "ddab242999407fadae68e7ee5381b0ec6679d443" |
19 | SRCREV_machine_qemux86-64 ?= "1238684aa5173dc6f431ad1b3c85a37830244824" | 19 | SRCREV_machine_qemux86-64 ?= "ddab242999407fadae68e7ee5381b0ec6679d443" |
20 | SRCREV_machine_qemumips64 ?= "8c40a1bc5e4ece3f72d4ade764087bd0fcc01c38" | 20 | SRCREV_machine_qemumips64 ?= "df3ba701aa1fa3b2faadc5445003e7577aa4f016" |
21 | SRCREV_machine ?= "1238684aa5173dc6f431ad1b3c85a37830244824" | 21 | SRCREV_machine ?= "ddab242999407fadae68e7ee5381b0ec6679d443" |
22 | SRCREV_meta ?= "8c6158ec5e43a4cae59058af49f70e0406d18091" | 22 | SRCREV_meta ?= "4789b41c5605189902d2c1a674f8616d41ee218d" |
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}" |