diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-06-24 08:44:42 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-27 12:20:35 +0100 |
commit | 469f037b3b7c73a8aeb362eccca935618388d4ea (patch) | |
tree | 7bcd396965e2bccd45a48b2a6abad16a18556e11 /meta | |
parent | 6c742d74917a736e8125170bd5adb3ccf7a2eb5c (diff) | |
download | poky-469f037b3b7c73a8aeb362eccca935618388d4ea.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)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 | ||||
-rw-r--r-- | 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 () { | |||
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "9c1e84c9b81b6bf1df55f26f2e0517266c37f7eb" | 14 | SRCREV_machine ?= "9c1e84c9b81b6bf1df55f26f2e0517266c37f7eb" |
15 | SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" | 15 | SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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 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" | |||
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "fabee455f397ba8054f35a3ad5f2250bbad93bef" | 18 | SRCREV_machine_qemuarm ?= "fabee455f397ba8054f35a3ad5f2250bbad93bef" |
19 | SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" | 19 | SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" |
20 | SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" | 20 | SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${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 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" | |||
21 | SRCREV_machine_qemux86-64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" | 21 | SRCREV_machine_qemux86-64 ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" |
22 | SRCREV_machine_qemumips64 ?= "5a8b27bcc0b16077ab8edfcd3fb25c80dc2c652e" | 22 | SRCREV_machine_qemumips64 ?= "5a8b27bcc0b16077ab8edfcd3fb25c80dc2c652e" |
23 | SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" | 23 | SRCREV_machine ?= "00638cdd8f92869a0f89ebe3289fdbd856ba9458" |
24 | SRCREV_meta ?= "97eac3146504a2348543b8b8859f44a7b8f0d590" | 24 | SRCREV_meta ?= "eb6ef084f987441359145c41cadcbdd768eeb012" |
25 | 25 | ||
26 | # remap qemuarm to qemuarma15 for the 5.0 kernel | 26 | # remap qemuarm to qemuarma15 for the 5.0 kernel |
27 | # KMACHINE_qemuarm ?= "qemuarma15" | 27 | # KMACHINE_qemuarm ?= "qemuarma15" |