From 01a4a4e24a2b61229be32f8852b2d5bc28c5689c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 6 Jun 2018 22:07:25 -0400 Subject: 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. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_4.14.bb | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'meta/recipes-kernel') 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 () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "5518de2bf72df8f5274f7fd6a909db8bb09e9216" -SRCREV_meta ?= "d1e170692e978b08f4736375cafccd58e331feb1" +SRCREV_machine ?= "cc0ac94a962306ff5867e1d3c2988d2004f50c8c" +SRCREV_meta ?= "b577f9a0bd658b9468080514f68b18fe37daff9c" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "ebe519f7ad579fedcdff91c2e32c4eef976299a6" -SRCREV_meta ?= "d1e170692e978b08f4736375cafccd58e331feb1" +SRCREV_machine ?= "f0905017bae82f733812b3e1a31abbf6d51f67c7" +SRCREV_meta ?= "b577f9a0bd658b9468080514f68b18fe37daff9c" PV = "${LINUX_VERSION}+git${SRCPV}" 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" KBRANCH_qemux86-64 ?= "v4.14/standard/base" KBRANCH_qemumips64 ?= "v4.14/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "493254190708d94e0bd22f6eb6e6c17cbdbf9764" -SRCREV_machine_qemuarm64 ?= "eeba95930402de2c0290b423c69e86b84955bf09" -SRCREV_machine_qemumips ?= "42b5e2db78595024d2fddfcadc8cd8af1266b52b" -SRCREV_machine_qemuppc ?= "b87ce52358105e318fbdb7087185de9622b420b3" -SRCREV_machine_qemux86 ?= "0e21580445573276ec320da0c36d56f8921f682b" -SRCREV_machine_qemux86-64 ?= "0e21580445573276ec320da0c36d56f8921f682b" -SRCREV_machine_qemumips64 ?= "c8885bcf579812bd6cfbb58b96d5d3423ccc45fc" -SRCREV_machine ?= "0e21580445573276ec320da0c36d56f8921f682b" -SRCREV_meta ?= "d1e170692e978b08f4736375cafccd58e331feb1" +SRCREV_machine_qemuarm ?= "8b98d346387e7d12941a2c0450c3c5ebc653da66" +SRCREV_machine_qemuarm64 ?= "5eceba0e988844c64cc1d0b2a7b428b9765da9b0" +SRCREV_machine_qemumips ?= "e596816df1c06fb68f751736bb2e9216f93e4a5d" +SRCREV_machine_qemuppc ?= "34cc4f2e3b441f52455832580c79b886ad47c71b" +SRCREV_machine_qemux86 ?= "ccd823982533ea9d36df09766f3a7d645b95ca7d" +SRCREV_machine_qemux86-64 ?= "ccd823982533ea9d36df09766f3a7d645b95ca7d" +SRCREV_machine_qemumips64 ?= "c50abb0247af8362692d6776139dfff03d754ff9" +SRCREV_machine ?= "ccd823982533ea9d36df09766f3a7d645b95ca7d" +SRCREV_meta ?= "b577f9a0bd658b9468080514f68b18fe37daff9c" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" -- cgit 1.2.3-korg