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 <[email protected]> > --- > 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 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
