summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-06-06 22:07:25 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-02 11:41:25 +0100
commit5e03004baf342a8b2d43f2df96de8d271f7d5425 (patch)
tree453f2debe6ab90a434203c89331e78b54c79b0ee /meta/recipes-kernel
parent43de26b5d0a69c1e2538cbd8807ae907c49d168d (diff)
downloadpoky-5e03004baf342a8b2d43f2df96de8d271f7d5425.tar.gz
linux-yocto/4.12: fix ppc cryptodev build
commit 6e36719fbe9 [crypto: aes-generic - fix aes-generic regression on powerpc] addresses a build regression by 4.14-stable. So we cherry pick it onto our branches while it works through the -stable process. (From OE-Core rev: 01a4a4e24a2b61229be32f8852b2d5bc28c5689c) (From OE-Core rev: 8f18cedf2442537249483ae88cfa240aedfab5f1) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.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.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.14.bb18
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
index db7941abd1..39236d90d9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "5518de2bf72df8f5274f7fd6a909db8bb09e9216" 14SRCREV_machine ?= "cc0ac94a962306ff5867e1d3c2988d2004f50c8c"
15SRCREV_meta ?= "d1e170692e978b08f4736375cafccd58e331feb1" 15SRCREV_meta ?= "b577f9a0bd658b9468080514f68b18fe37daff9c"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
index ae459761f9..3171bb9d78 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb
@@ -12,8 +12,8 @@ DEPENDS += "openssl-native util-linux-native"
12KMETA = "kernel-meta" 12KMETA = "kernel-meta"
13KCONF_BSP_AUDIT_LEVEL = "2" 13KCONF_BSP_AUDIT_LEVEL = "2"
14 14
15SRCREV_machine ?= "ebe519f7ad579fedcdff91c2e32c4eef976299a6" 15SRCREV_machine ?= "f0905017bae82f733812b3e1a31abbf6d51f67c7"
16SRCREV_meta ?= "d1e170692e978b08f4736375cafccd58e331feb1" 16SRCREV_meta ?= "b577f9a0bd658b9468080514f68b18fe37daff9c"
17 17
18PV = "${LINUX_VERSION}+git${SRCPV}" 18PV = "${LINUX_VERSION}+git${SRCPV}"
19 19
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
index c8f31a6ebc..1993ac788a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v4.14/standard/base"
11KBRANCH_qemux86-64 ?= "v4.14/standard/base" 11KBRANCH_qemux86-64 ?= "v4.14/standard/base"
12KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" 12KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "493254190708d94e0bd22f6eb6e6c17cbdbf9764" 14SRCREV_machine_qemuarm ?= "8b98d346387e7d12941a2c0450c3c5ebc653da66"
15SRCREV_machine_qemuarm64 ?= "eeba95930402de2c0290b423c69e86b84955bf09" 15SRCREV_machine_qemuarm64 ?= "5eceba0e988844c64cc1d0b2a7b428b9765da9b0"
16SRCREV_machine_qemumips ?= "42b5e2db78595024d2fddfcadc8cd8af1266b52b" 16SRCREV_machine_qemumips ?= "e596816df1c06fb68f751736bb2e9216f93e4a5d"
17SRCREV_machine_qemuppc ?= "b87ce52358105e318fbdb7087185de9622b420b3" 17SRCREV_machine_qemuppc ?= "34cc4f2e3b441f52455832580c79b886ad47c71b"
18SRCREV_machine_qemux86 ?= "0e21580445573276ec320da0c36d56f8921f682b" 18SRCREV_machine_qemux86 ?= "ccd823982533ea9d36df09766f3a7d645b95ca7d"
19SRCREV_machine_qemux86-64 ?= "0e21580445573276ec320da0c36d56f8921f682b" 19SRCREV_machine_qemux86-64 ?= "ccd823982533ea9d36df09766f3a7d645b95ca7d"
20SRCREV_machine_qemumips64 ?= "c8885bcf579812bd6cfbb58b96d5d3423ccc45fc" 20SRCREV_machine_qemumips64 ?= "c50abb0247af8362692d6776139dfff03d754ff9"
21SRCREV_machine ?= "0e21580445573276ec320da0c36d56f8921f682b" 21SRCREV_machine ?= "ccd823982533ea9d36df09766f3a7d645b95ca7d"
22SRCREV_meta ?= "d1e170692e978b08f4736375cafccd58e331feb1" 22SRCREV_meta ?= "b577f9a0bd658b9468080514f68b18fe37daff9c"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}"