[PATCH 0/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[PATCH 0/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[Mariano López]

Some architectures have SCSI support disabled by default and trying to
build the scsi_debug module will throw a warning, for a missing
dependency, when building the kernel. This patch will enable SCSI
support for all architectures when ptest is listed in the
DISTRO_FEATURES.

The following changes since commit 111b7173fee69fe8b01ec2fa6999713841326537:

  dev-manual: Fixed grammar issue. (2019-06-18 11:29:23 +0100)

are available in the Git repository at:

  git://github.com/justanotherboy/poky bug13301p3
  https://github.com/justanotherboy/poky/tree/bug13301p3

Mariano López (1):
  linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
 meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
 meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

-- 
2.21.0

[PATCH 1/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[Mariano López]

The scsi_debug module can't be built in some architectures as they have
SCSI support disabled by default. This patch will enable SCSI support as
well as the scsi_debug module when ptest is in DISTRO_FEATURES.

Signed-off-by: Mariano López <just.another.mariano@gmail.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
 meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
 meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
 meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

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 0836dc7ea0..e6c8ee320c 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
@@ -41,4 +41,7 @@ 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)}"
+KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "\
+                            features/scsi/scsi.scc \
+                            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 b5e415f935..06fd642506 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb
@@ -41,4 +41,7 @@ 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)}"
+KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "\
+                            features/scsi/scsi.scc \
+                            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 cda4ecf89e..65b4f68c3d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.19.bb
@@ -47,4 +47,7 @@ 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)}"
+KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "\
+                            features/scsi/scsi.scc \
+                            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 8aec315084..ac813a8663 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.0.bb
@@ -50,4 +50,7 @@ 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)}"
+KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "\
+                            features/scsi/scsi.scc \
+                            features/scsi/scsi-debug.scc \
+                         ","" ,d)}"
-- 
2.21.0

Re: [PATCH 1/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[Richard Purdie]

On Tue, 2019-06-18 at 15:10 -0500, Mariano López wrote:
> The scsi_debug module can't be built in some architectures as they
> have
> SCSI support disabled by default. This patch will enable SCSI support
> as
> well as the scsi_debug module when ptest is in DISTRO_FEATURES.
> 
> Signed-off-by: Mariano López <just.another.mariano@gmail.com>
> ---
>  meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
>  meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
>  meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
>  meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
>  4 files changed, 16 insertions(+), 4 deletions(-)
> 
> 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 0836dc7ea0..e6c8ee320c 100644
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> @@ -41,4 +41,7 @@ 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)}"
> +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES",
> "ptest", "\
> +                            features/scsi/scsi.scc \
> +                            features/scsi/scsi-debug.scc \
> +                         ","" ,d)}"

Question to Bruce - can we mark scsi-debug.scc as having a dependency
on scsi.scc?

Cheers,

Richard

Re: [PATCH 1/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[Bruce Ashfield]

On Wed, Jun 19, 2019 at 6:51 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Tue, 2019-06-18 at 15:10 -0500, Mariano López wrote:
> > The scsi_debug module can't be built in some architectures as they
> > have
> > SCSI support disabled by default. This patch will enable SCSI support
> > as
> > well as the scsi_debug module when ptest is in DISTRO_FEATURES.
> >
> > Signed-off-by: Mariano López <just.another.mariano@gmail.com>
> > ---
> >  meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
> >  meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
> >  meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
> >  meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
> >  4 files changed, 16 insertions(+), 4 deletions(-)
> >
> > 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 0836dc7ea0..e6c8ee320c 100644
> > --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > @@ -41,4 +41,7 @@ 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)}"
> > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES",
> > "ptest", "\
> > +                            features/scsi/scsi.scc \
> > +                            features/scsi/scsi-debug.scc \
> > +                         ","" ,d)}"
>
> Question to Bruce - can we mark scsi-debug.scc as having a dependency
> on scsi.scc?

With the goal that we can only list one of the fragments in the
KERNEL_FEATURES append ?
We can do something like that, I just want to make sure I'm grok'ing
the end goal.

Bruce

>
> Cheers,
>
> Richard
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [PATCH 1/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[richard.purdie]

On Wed, 2019-06-19 at 08:24 -0400, Bruce Ashfield wrote:
> On Wed, Jun 19, 2019 at 6:51 AM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Tue, 2019-06-18 at 15:10 -0500, Mariano López wrote:
> > > The scsi_debug module can't be built in some architectures as
> > > they
> > > have
> > > SCSI support disabled by default. This patch will enable SCSI
> > > support
> > > as
> > > well as the scsi_debug module when ptest is in DISTRO_FEATURES.
> > > 
> > > Signed-off-by: Mariano López <just.another.mariano@gmail.com>
> > > ---
> > >  meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
> > >  meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
> > >  meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
> > >  meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
> > >  4 files changed, 16 insertions(+), 4 deletions(-)
> > > 
> > > 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 0836dc7ea0..e6c8ee320c 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > > @@ -41,4 +41,7 @@ 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)}"
> > > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES"
> > > ,
> > > "ptest", "\
> > > +                            features/scsi/scsi.scc \
> > > +                            features/scsi/scsi-debug.scc \
> > > +                         ","" ,d)}"
> > 
> > Question to Bruce - can we mark scsi-debug.scc as having a
> > dependency
> > on scsi.scc?
> 
> With the goal that we can only list one of the fragments in the
> KERNEL_FEATURES append ?
> We can do something like that, I just want to make sure I'm grok'ing
> the end goal.

Yes, it just seems odd that you'd have to remember to list both.

If listing both makes sense I'm ok with it, I just thought it worth
asking that question as it does seem like a missing dependency.

Cheers,

Richard

Re: [PATCH 1/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[Bruce Ashfield]

On Wed, Jun 19, 2019 at 8:44 AM <richard.purdie@linuxfoundation.org> wrote:
>
> On Wed, 2019-06-19 at 08:24 -0400, Bruce Ashfield wrote:
> > On Wed, Jun 19, 2019 at 6:51 AM Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> > > On Tue, 2019-06-18 at 15:10 -0500, Mariano López wrote:
> > > > The scsi_debug module can't be built in some architectures as
> > > > they
> > > > have
> > > > SCSI support disabled by default. This patch will enable SCSI
> > > > support
> > > > as
> > > > well as the scsi_debug module when ptest is in DISTRO_FEATURES.
> > > >
> > > > Signed-off-by: Mariano López <just.another.mariano@gmail.com>
> > > > ---
> > > >  meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
> > > >  meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
> > > >  meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
> > > >  meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
> > > >  4 files changed, 16 insertions(+), 4 deletions(-)
> > > >
> > > > 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 0836dc7ea0..e6c8ee320c 100644
> > > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > > > @@ -41,4 +41,7 @@ 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)}"
> > > > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES"
> > > > ,
> > > > "ptest", "\
> > > > +                            features/scsi/scsi.scc \
> > > > +                            features/scsi/scsi-debug.scc \
> > > > +                         ","" ,d)}"
> > >
> > > Question to Bruce - can we mark scsi-debug.scc as having a
> > > dependency
> > > on scsi.scc?
> >
> > With the goal that we can only list one of the fragments in the
> > KERNEL_FEATURES append ?
> > We can do something like that, I just want to make sure I'm grok'ing
> > the end goal.
>
> Yes, it just seems odd that you'd have to remember to list both.
>
> If listing both makes sense I'm ok with it, I just thought it worth
> asking that question as it does seem like a missing dependency.
>

No problem. I'll see what I can come up with today and follow up with
some info/details.

Bruce

> Cheers,
>
> Richard
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Re: [PATCH 1/1] linux-yocto: Add SCSI support when ptest is in DISTRO_FEATURES

[Bruce Ashfield]

On Wed, Jun 19, 2019 at 9:11 AM Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
> On Wed, Jun 19, 2019 at 8:44 AM <richard.purdie@linuxfoundation.org> wrote:
> >
> > On Wed, 2019-06-19 at 08:24 -0400, Bruce Ashfield wrote:
> > > On Wed, Jun 19, 2019 at 6:51 AM Richard Purdie
> > > <richard.purdie@linuxfoundation.org> wrote:
> > > > On Tue, 2019-06-18 at 15:10 -0500, Mariano López wrote:
> > > > > The scsi_debug module can't be built in some architectures as
> > > > > they
> > > > > have
> > > > > SCSI support disabled by default. This patch will enable SCSI
> > > > > support
> > > > > as
> > > > > well as the scsi_debug module when ptest is in DISTRO_FEATURES.
> > > > >
> > > > > Signed-off-by: Mariano López <just.another.mariano@gmail.com>
> > > > > ---
> > > > >  meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 5 ++++-
> > > > >  meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb  | 5 ++++-
> > > > >  meta/recipes-kernel/linux/linux-yocto_4.19.bb    | 5 ++++-
> > > > >  meta/recipes-kernel/linux/linux-yocto_5.0.bb     | 5 ++++-
> > > > >  4 files changed, 16 insertions(+), 4 deletions(-)
> > > > >
> > > > > 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 0836dc7ea0..e6c8ee320c 100644
> > > > > --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > > > > +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb
> > > > > @@ -41,4 +41,7 @@ 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)}"
> > > > > +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES"
> > > > > ,
> > > > > "ptest", "\
> > > > > +                            features/scsi/scsi.scc \
> > > > > +                            features/scsi/scsi-debug.scc \
> > > > > +                         ","" ,d)}"
> > > >
> > > > Question to Bruce - can we mark scsi-debug.scc as having a
> > > > dependency
> > > > on scsi.scc?
> > >
> > > With the goal that we can only list one of the fragments in the
> > > KERNEL_FEATURES append ?
> > > We can do something like that, I just want to make sure I'm grok'ing
> > > the end goal.
> >
> > Yes, it just seems odd that you'd have to remember to list both.
> >
> > If listing both makes sense I'm ok with it, I just thought it worth
> > asking that question as it does seem like a missing dependency.
> >
>
> No problem. I'll see what I can come up with today and follow up with
> some info/details.

I'm building a tweak now.

scsi-debug just needs to include the core scsi support. Some
features/fragments have different goals/use cases .. in this case,
scsci-debug should haul in  everything it needs to be included as a
standalone feature.

Assuming my test works, the patch would just need to include
scsi-debug.scc for all the platforms, and everything will just work.

Bruce


>
> Bruce
>
> > Cheers,
> >
> > Richard
> >
>
>
> --
> - Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end
> - "Use the force Harry" - Gandalf, Star Trek II



-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II