* [PATCH 0/2] Use scsi-debug kernel module for util-linux's ptest @ 2019-06-14 3:32 Mariano López 2019-06-14 3:32 ` [PATCH 1/2] util-linux: Stop udevd to run ptests Mariano López 2019-06-14 3:32 ` [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES Mariano López 0 siblings, 2 replies; 7+ messages in thread From: Mariano López @ 2019-06-14 3:32 UTC (permalink / raw) To: openembedded-core These patches will allow the use of scsi-debug kernel module for eject/mount related tests of the util-linux package. The following changes since commit e00d88475d0ed7b161f5f58dd13bc9a72e3efdf9: bluez: fix test case failures with GCC 9 (2019-06-12 21:08:52 +0100) are available in the Git repository at: git://github.com/justanotherboy/poky bug13301p2 https://github.com/justanotherboy/poky/tree/bug13301p2 Mariano López (2): util-linux: Stop udevd to run ptests linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES meta/recipes-core/util-linux/util-linux.inc | 4 ++++ meta/recipes-core/util-linux/util-linux/run-ptest | 14 ++++++++++++++ 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 + 6 files changed, 22 insertions(+) -- 2.21.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] util-linux: Stop udevd to run ptests 2019-06-14 3:32 [PATCH 0/2] Use scsi-debug kernel module for util-linux's ptest Mariano López @ 2019-06-14 3:32 ` Mariano López 2019-06-14 3:32 ` [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES Mariano López 1 sibling, 0 replies; 7+ messages in thread From: Mariano López @ 2019-06-14 3:32 UTC (permalink / raw) To: openembedded-core The util-linux's ptest uses the SCSI_DEBUG kernel module to create virtual SCSI disks. The automount feature of udevd will try to mount these disks by default. Because udevd controls the mount of the disks, the eject/mount tests will fail or be skipped. This change will stop udevd before executing the util-linux's ptest and start the daemon again after all the tests. This is for eudevd only, systemd-udevd doesn't present this problem because there are no automount rules. [YOCTO #13301] Signed-off-by: Mariano López <just.another.mariano@gmail.com> --- meta/recipes-core/util-linux/util-linux.inc | 4 ++++ meta/recipes-core/util-linux/util-linux/run-ptest | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index df1d1224dd..1d279a58aa 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -318,4 +318,8 @@ do_install_ptest() { sed -i -e \ '/^TS_CMD_KILL/ s|kill|${PTEST_PATH}/bin/kill|g' \ ${D}${PTEST_PATH}/tests/commands.sh + + + sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest + } diff --git a/meta/recipes-core/util-linux/util-linux/run-ptest b/meta/recipes-core/util-linux/util-linux/run-ptest index 03248325bf..e135ee583b 100644 --- a/meta/recipes-core/util-linux/util-linux/run-ptest +++ b/meta/recipes-core/util-linux/util-linux/run-ptest @@ -1,5 +1,14 @@ #!/bin/sh + +# When udevd (from eudev) is running most eject/mount tests will fail because +# of automount. We need to stop udevd before executing util-linux's tests. +# The systemd-udevd daemon doesn't change the outcome of util-linux's tests. +UDEV_PID="`pidof "@base_sbindir@/udevd"`" +if [ "x$UDEV_PID" != "x" ]; then + /etc/init.d/udev stop +fi + current_path=$(readlink -f $0) export bindir=$(dirname $current_path) export PATH=$bindir/bin:$PATH @@ -27,3 +36,8 @@ do }' done + +if [ "x$UDEV_PID" != "x" ]; then + /etc/init.d/udev start +fi + -- 2.21.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES 2019-06-14 3:32 [PATCH 0/2] Use scsi-debug kernel module for util-linux's ptest Mariano López 2019-06-14 3:32 ` [PATCH 1/2] util-linux: Stop udevd to run ptests Mariano López @ 2019-06-14 3:32 ` Mariano López 2019-06-15 15:15 ` Richard Purdie 1 sibling, 1 reply; 7+ messages in thread From: Mariano López @ 2019-06-14 3:32 UTC (permalink / raw) To: openembedded-core 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@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)}" -- 2.21.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES 2019-06-14 3:32 ` [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES Mariano López @ 2019-06-15 15:15 ` Richard Purdie 2019-06-15 19:47 ` Mariano Lopez 0 siblings, 1 reply; 7+ messages in thread From: Richard Purdie @ 2019-06-15 15:15 UTC (permalink / raw) To: Mariano López, openembedded-core 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@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 ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES 2019-06-15 15:15 ` Richard Purdie @ 2019-06-15 19:47 ` Mariano Lopez 2019-06-16 1:02 ` Bruce Ashfield 0 siblings, 1 reply; 7+ messages in thread From: Mariano Lopez @ 2019-06-15 19:47 UTC (permalink / raw) To: Richard Purdie, openembedded-core 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@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:( Let me look into this and send another patch Thanks, Mairano ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES 2019-06-15 19:47 ` Mariano Lopez @ 2019-06-16 1:02 ` Bruce Ashfield 2019-06-18 22:02 ` Mariano Lopez 0 siblings, 1 reply; 7+ messages in thread From: Bruce Ashfield @ 2019-06-16 1:02 UTC (permalink / raw) To: Mariano Lopez; +Cc: Patches and discussions about the oe-core layer On Sat, Jun 15, 2019 at 3:47 PM Mariano Lopez <just.another.mariano@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@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 > Let me look into this and send another patch > > Thanks, > Mairano > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES 2019-06-16 1:02 ` Bruce Ashfield @ 2019-06-18 22:02 ` Mariano Lopez 0 siblings, 0 replies; 7+ messages in thread From: Mariano Lopez @ 2019-06-18 22:02 UTC (permalink / raw) To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer On 6/15/19 8:02 PM, Bruce Ashfield wrote: > On Sat, Jun 15, 2019 at 3:47 PM Mariano Lopez > <just.another.mariano@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@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 >> > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-06-18 22:02 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-14 3:32 [PATCH 0/2] Use scsi-debug kernel module for util-linux's ptest Mariano López 2019-06-14 3:32 ` [PATCH 1/2] util-linux: Stop udevd to run ptests Mariano López 2019-06-14 3:32 ` [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES Mariano López 2019-06-15 15:15 ` Richard Purdie 2019-06-15 19:47 ` Mariano Lopez 2019-06-16 1:02 ` Bruce Ashfield 2019-06-18 22:02 ` Mariano Lopez
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox