[OE-core] [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES

[Mariano Lopez]

On 6/15/19 8:02 PM, Bruce Ashfield wrote:
> On Sat, Jun 15, 2019 at 3:47 PM Mariano Lopez
> <just.another.mariano at gmail.com> wrote:
>>
>> On 6/15/19 10:15 AM, Richard Purdie wrote:
>>> On Thu, 2019-06-13 at 22:32 -0500, Mariano López wrote:
>>>> util-linux ptest requires the scsi_debug module to perform eject/mount
>>>> tests. This will conditionally add scsi_debug module when ptest is in
>>>> DISTRO_FEATURES.
>>>>
>>>> This doesn't include linux-yocto-tiny because the resulting image will
>>>> be too big and do_image would complain about this.
>>>>
>>>> [YOCTO #13301]
>>>>
>>>> Signed-off-by: Mariano López <just.another.mariano at gmail.com>
>>>> ---
>>>>    meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 +
>>>>    meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 1 +
>>>>    meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 1 +
>>>>    meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 1 +
>>>>    4 files changed, 4 insertions(+)
>>>>
>>>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
>>>> index 6604bdf90c..0836dc7ea0 100644
>>>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
>>>> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
>>>> @@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
>>>>    KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
>>>>    KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>>    KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>> +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
>>>> 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 1fe28b1bf0..b5e415f935 100644
>>>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
>>>> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
>>>> @@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
>>>>    KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
>>>>    KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>>    KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>> +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
>>>> diff --git a/meta/recipes-kernel/linux/linux-yocto_4.19.bb b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
>>>> index a5fdafe6b2..cda4ecf89e 100644
>>>> --- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
>>>> +++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
>>>> @@ -47,3 +47,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
>>>>    KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>>    KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>>    KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
>>>> +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
>>>> diff --git a/meta/recipes-kernel/linux/linux-yocto_5.0.bb b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
>>>> index da795d97aa..8aec315084 100644
>>>> --- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
>>>> +++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
>>>> @@ -50,3 +50,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc"
>>>>    KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>>    KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
>>>>    KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"
>>>> +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
>>> I merged this but have just realised its causing warnings:
>>>
>>> https://autobuilder.yoctoproject.org/typhoon/#/builders/93/builds/31
>>>
>>> which suggest its not quite doing what we hope/need? :/
>>>
>>> Cheers,
>>>
>>> Richard
>> Indeed, it seems the configuration is not applied for the qemuarm64
>> MACHINE:(
>>
> It would be applied, but it may be missing some dependency on that
> machine and is hence not enabled in the final kernel .config.
>
> Bruce

SCSI support is not enabled by default for ARM architectures, I just 
sent the patch for this:
http://lists.openembedded.org/pipermail/openembedded-core/2019-June/283775.html


Thanks!
Mariano

>
>> Let me look into this and send another patch
>>
>> Thanks,
>> Mairano
>>
>