From 66d657c138ef27b539a1abdb127794429b6e2dab Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Fri, 2 Jul 2021 11:13:43 -0400 Subject: linux-yocto/5.10: scsi-debug needs scsi-disk It was pointed out that the default scsi-debug feature didn't behave the same as other distros, since it doesn't have disk supporrt enabled. We already have a disk.cfg for scsi so we include it into the debug fragment to get the support we want. Integrating the following commit(s) to linux-yocto/.: 66a4b5fc619 scsi: debug needs disk support (From OE-Core rev: 8c3ca417a7e9e3c670f1cbff2352c8761b60caff) Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 1c5bb9753c..e0d8280128 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "42032770803ba26765376967cef09945f48abe04" -SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31" +SRCREV_meta ?= "82899c6a7119b9668be9ae508159f5ac96554cc2" 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.10;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index bdc49fb9e2..6b71573a39 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "eaad1adbc817d996edf44fdd520da4810e57e66d" SRCREV_machine ?= "52bcc5b2342739bbfc8fc385d151616883c4425c" -SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31" +SRCREV_meta ?= "82899c6a7119b9668be9ae508159f5ac96554cc2" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index abe837c2f4..0315808989 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -23,7 +23,7 @@ SRCREV_machine_qemux86 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c" SRCREV_machine_qemux86-64 ?= "52bcc5b2342739bbfc8fc385d151616883c4425c" SRCREV_machine_qemumips64 ?= "1112c8f8594df02dd6f2bd1cf13848536ca3f536" SRCREV_machine ?= "52bcc5b2342739bbfc8fc385d151616883c4425c" -SRCREV_meta ?= "c96c799ca3e63c0ca17e05843d3f8e7e0d6dfb31" +SRCREV_meta ?= "82899c6a7119b9668be9ae508159f5ac96554cc2" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit v1.2.3-54-g00ecf