From c65826e96a77928938fef69fc0cbc65ec7431cb2 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 24 Jun 2019 08:44:42 -0400 Subject: linux-yocto/5.0: make scsi-debug include scsi core configs Updating the scsi-debug fragment to include the core scsi config options. This allows standalone use of the fragment, since all supporting options will be enabled simply by including the top level config in a BSP. This also removes a configuration warning on qemuarm, since we will no longer have missing / unavailable options during the config audit. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb index c5bd342d5b..35f2350d52 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "9c1e84c9b81b6bf1df55f26f2e0517266c37f7eb" -SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" +SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012" 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-5.0;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb index d6e45c69c0..96cfb3dcd1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "fabee455f397ba8054f35a3ad5f2250bbad93bef" SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" -SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" +SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb index 5bc2d54916..d4d30853f0 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" SRCREV_machine_qemux86-64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" SRCREV_machine_qemumips64 ?= "5a8b27bcc0b16077ab8edfcd3fb25c80dc2c652e" SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" -SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" +SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg