diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2016-07-29 10:06:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-04 15:22:20 +0100 |
commit | a996ae62280900d76d84b5f3c472864510f26e46 (patch) | |
tree | 928f539bd48a351ad04bce06814cadd39c2eba21 /meta | |
parent | 453c174e412605b3990d9ef4b6551320a0d98bd8 (diff) | |
download | poky-a996ae62280900d76d84b5f3c472864510f26e46.tar.gz |
linux-yocto/4.1: qemuppc and qemumips build fixes
The v4.1.28 -stable update broke the build for some ppc and mips
platforms. We fix the errors by backporting a missing commit for
ppc:
powerpc/tm: Abort syscalls in active transactions
And by reverting a commit for mips (rather than backporting more
changes to -mm):
Revert "MIPS: Reserve nosave data for hibernation"
(From OE-Core rev: 02a1d6eb52b78c7fdcfe2a64e427488e6dd9ce4d)
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 | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.1.bb | 8 |
3 files changed, 6 insertions, 6 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 49157902ab..4171062172 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb | |||
@@ -12,7 +12,7 @@ python () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "0b68498784da5defb7658675e37d9bc615cd4c50" | 14 | SRCREV_machine ?= "0b68498784da5defb7658675e37d9bc615cd4c50" |
15 | SRCREV_meta ?= "afbc6bd00e6fa854ae10eb67ab8c3be5112f6f41" | 15 | SRCREV_meta ?= "0d6de63d4603b9cc3a4a68391bcb5156b9b0cf96" |
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 9187f85429..08b931ca9f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb | |||
@@ -10,7 +10,7 @@ KMETA = "kernel-meta" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "44af900716206d4cae283aa74e92f4118720724a" | 12 | SRCREV_machine ?= "44af900716206d4cae283aa74e92f4118720724a" |
13 | SRCREV_meta ?= "afbc6bd00e6fa854ae10eb67ab8c3be5112f6f41" | 13 | SRCREV_meta ?= "0d6de63d4603b9cc3a4a68391bcb5156b9b0cf96" |
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 fb10f40811..ef3d000a2f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.1.bb | |||
@@ -13,13 +13,13 @@ KBRANCH_qemumips64 ?= "standard/mti-malta64" | |||
13 | 13 | ||
14 | SRCREV_machine_qemuarm ?= "460340f28dd4ed608fd66692bcbac0bb24fe4aaf" | 14 | SRCREV_machine_qemuarm ?= "460340f28dd4ed608fd66692bcbac0bb24fe4aaf" |
15 | SRCREV_machine_qemuarm64 ?= "44af900716206d4cae283aa74e92f4118720724a" | 15 | SRCREV_machine_qemuarm64 ?= "44af900716206d4cae283aa74e92f4118720724a" |
16 | SRCREV_machine_qemumips ?= "9b9337aa156bd3bcf3e813455e4bbdc2895c4da1" | 16 | SRCREV_machine_qemumips ?= "0ff21b2a5e92defa32b7cb76d39980b63a2eb5ca" |
17 | SRCREV_machine_qemuppc ?= "44af900716206d4cae283aa74e92f4118720724a" | 17 | SRCREV_machine_qemuppc ?= "6bd2872ce7e397d285f7df00f4d0efac286e2401" |
18 | SRCREV_machine_qemux86 ?= "44af900716206d4cae283aa74e92f4118720724a" | 18 | SRCREV_machine_qemux86 ?= "44af900716206d4cae283aa74e92f4118720724a" |
19 | SRCREV_machine_qemux86-64 ?= "44af900716206d4cae283aa74e92f4118720724a" | 19 | SRCREV_machine_qemux86-64 ?= "44af900716206d4cae283aa74e92f4118720724a" |
20 | SRCREV_machine_qemumips64 ?= "cb03bb92ed4d45c55e7a8ecfcca714f9897da96b" | 20 | SRCREV_machine_qemumips64 ?= "248861985b609d1cd24e8d23b7d15abfb31cbdc2" |
21 | SRCREV_machine ?= "44af900716206d4cae283aa74e92f4118720724a" | 21 | SRCREV_machine ?= "44af900716206d4cae283aa74e92f4118720724a" |
22 | SRCREV_meta ?= "afbc6bd00e6fa854ae10eb67ab8c3be5112f6f41" | 22 | SRCREV_meta ?= "0d6de63d4603b9cc3a4a68391bcb5156b9b0cf96" |
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}" |