summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2019-10-29 10:47:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-30 13:47:54 +0000
commitee52ee1d64ba0678cd84f1236b3401ab0cfd38ca (patch)
treecbbaa279d5a224965e7453b537d6599d2846c4aa
parent314f062519727aa001c3de59b4e0379a7727a244 (diff)
downloadpoky-ee52ee1d64ba0678cd84f1236b3401ab0cfd38ca.tar.gz
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. (From OE-Core rev: c65826e96a77928938fef69fc0cbc65ec7431cb2) (From OE-Core rev: 6c2c6bed0bd5f0a303b9aacfab7db6daec3ee878) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.0.bb2
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 aa1609c293..cc6ffd5351 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 () {
12} 12}
13 13
14SRCREV_machine ?= "9c1e84c9b81b6bf1df55f26f2e0517266c37f7eb" 14SRCREV_machine ?= "9c1e84c9b81b6bf1df55f26f2e0517266c37f7eb"
15SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" 15SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012"
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-5.0;destsuffix=${KMETA}" 18 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 603c0c5b5f..a3a9315acd 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"
17 17
18SRCREV_machine_qemuarm ?= "fabee455f397ba8054f35a3ad5f2250bbad93bef" 18SRCREV_machine_qemuarm ?= "fabee455f397ba8054f35a3ad5f2250bbad93bef"
19SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" 19SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458"
20SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" 20SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
index 88eacc2123..b106a37f17 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458"
19SRCREV_machine_qemux86-64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" 19SRCREV_machine_qemux86-64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458"
20SRCREV_machine_qemumips64 ?= "5a8b27bcc0b16077ab8edfcd3fb25c80dc2c652e" 20SRCREV_machine_qemumips64 ?= "5a8b27bcc0b16077ab8edfcd3fb25c80dc2c652e"
21SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" 21SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458"
22SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" 22SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012"
23 23
24# remap qemuarm to qemuarma15 for the 5.0 kernel 24# remap qemuarm to qemuarma15 for the 5.0 kernel
25# KMACHINE_qemuarm ?= "qemuarma15" 25# KMACHINE_qemuarm ?= "qemuarma15"