[PATCH] kernel-module-split: rrecommend kernel-image instead of rdepend

[PATCH] kernel-module-split: rrecommend kernel-image instead of rdepend

[Martin Hundebøll]

Hard depending on the kernel makes it impossible to install kernel
modules without getting the kernel image installed too. This is
inconvenient in e.g. initramdisks, where the kernel is loaded from
outside the initramdisk.

Making the kernel modules rrecommend kernel-image-<version> instead of
rdepending on it, makes it possible to install kernel modules without
the kernel image by setting "kernel-image" in BAD_RECOMMENDATIONS.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
---
 meta/classes/kernel-module-split.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index ba9cc1517e..7a0260e3db 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,6 +120,11 @@ python split_kernel_module_packages () {
                 rdepends[dep] = []
         d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
 
+        # let kernel modules runtime recommend kernel image
+        rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
+        rrecommends['kernel-image'] = []
+        d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
+
         # Avoid automatic -dev recommendations for modules ending with -dev.
         d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
 
@@ -138,7 +143,7 @@ python split_kernel_module_packages () {
     postinst = d.getVar('pkg_postinst_modules')
     postrm = d.getVar('pkg_postrm_modules')
 
-    modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
+    modules = do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
     if modules:
         metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
         d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
-- 
2.14.1

✗ patchtest: failure for kernel-module-split: rrecommend kernel-image instead of rdepend

[Patchwork]

== Series Details ==

Series: kernel-module-split: rrecommend kernel-image instead of rdepend
Revision: 1
URL   : https://patchwork.openembedded.org/series/8386/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 5c9ef0734d)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

[PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Martin Hundebøll]

Hard depending on the kernel makes it impossible to install kernel
modules without getting the kernel image installed too. This is
inconvenient in e.g. initramdisks, where the kernel is loaded from
outside the initramdisk.

Making the kernel modules rrecommend kernel-image-<version> instead of
rdepending on it, makes it possible to install kernel modules without
the kernel image by setting "kernel-image" in BAD_RECOMMENDATIONS.

Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
---
 meta/classes/kernel-module-split.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 1035525dac..78843c5474 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,6 +120,11 @@ python split_kernel_module_packages () {
                 rdepends[dep] = []
         d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
 
+        # let kernel modules runtime recommend kernel image
+        rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
+        rrecommends['kernel-image'] = []
+        d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
+
         # Avoid automatic -dev recommendations for modules ending with -dev.
         d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
 
@@ -138,7 +143,7 @@ python split_kernel_module_packages () {
     postinst = d.getVar('pkg_postinst_modules')
     postrm = d.getVar('pkg_postrm_modules')
 
-    modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
+    modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
     if modules:
         metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
         d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
-- 
2.14.1

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Paul Barker]

On Mon, Aug 21, 2017 at 10:21 AM, Martin Hundebøll <mnhu@prevas.dk> wrote:
> Hard depending on the kernel makes it impossible to install kernel
> modules without getting the kernel image installed too. This is
> inconvenient in e.g. initramdisks, where the kernel is loaded from
> outside the initramdisk.
>
> Making the kernel modules rrecommend kernel-image-<version> instead of
> rdepending on it, makes it possible to install kernel modules without
> the kernel image by setting "kernel-image" in BAD_RECOMMENDATIONS.
>
> Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
> ---
>  meta/classes/kernel-module-split.bbclass | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
> index 1035525dac..78843c5474 100644
> --- a/meta/classes/kernel-module-split.bbclass
> +++ b/meta/classes/kernel-module-split.bbclass
> @@ -120,6 +120,11 @@ python split_kernel_module_packages () {
>                  rdepends[dep] = []
>          d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
>
> +        # let kernel modules runtime recommend kernel image
> +        rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
> +        rrecommends['kernel-image'] = []
> +        d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
> +
>          # Avoid automatic -dev recommendations for modules ending with -dev.
>          d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
>
> @@ -138,7 +143,7 @@ python split_kernel_module_packages () {
>      postinst = d.getVar('pkg_postinst_modules')
>      postrm = d.getVar('pkg_postrm_modules')
>
> -    modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
> +    modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
>      if modules:
>          metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
>          d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
> --
> 2.14.1
>

This breaks the method described in the kernel dev FAQ to omit the
kernel image from the rootfs which is to set the following in a conf
file:

    RDEPENDS_kernel-base = ""

See http://www.yoctoproject.org/docs/2.3.1/kernel-dev/kernel-dev.html#idm45690538384880.

By recommending kernel-image directly instead of recommending the
top-level kernel-<version> package which was actually removed from
extra_depends, we skip the inclusion of the kernel-base package. I'm
not familiar enough with the details of kernel module loading to know
if the 2 files in kernel-base (modules.builtin and modules.order) are
strictly needed but I think they should at least be included in via
recommendation.

As we already have a documented way to omit the kernel image, can we
revert this?

As an alternative I can send in a patch which changes the recommend to
the top-level kernel-<version> package instead of kernel-image.

-- 
Paul Barker
Togán Labs Ltd

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Andre McCurdy]

On Fri, Sep 8, 2017 at 1:06 PM, Paul Barker <pbarker@toganlabs.com> wrote:
>
> This breaks the method described in the kernel dev FAQ to omit the
> kernel image from the rootfs which is to set the following in a conf
> file:
>
>     RDEPENDS_kernel-base = ""
>
> See http://www.yoctoproject.org/docs/2.3.1/kernel-dev/kernel-dev.html#idm45690538384880.
>
> By recommending kernel-image directly instead of recommending the
> top-level kernel-<version> package which was actually removed from
> extra_depends, we skip the inclusion of the kernel-base package. I'm
> not familiar enough with the details of kernel module loading to know
> if the 2 files in kernel-base (modules.builtin and modules.order) are
> strictly needed but I think they should at least be included in via
> recommendation.
>
> As we already have a documented way to omit the kernel image, can we
> revert this?

I think reverting would be preferred. I have multiple machine configs
etc which rely on the existing approach.

> As an alternative I can send in a patch which changes the recommend to
> the top-level kernel-<version> package instead of kernel-image.
>
> --
> Paul Barker
> Togán Labs Ltd
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Denys Dmytriyenko]

On Fri, Sep 08, 2017 at 09:06:17PM +0100, Paul Barker wrote:
> On Mon, Aug 21, 2017 at 10:21 AM, Martin Hundebøll <mnhu@prevas.dk> wrote:
> > Hard depending on the kernel makes it impossible to install kernel
> > modules without getting the kernel image installed too. This is
> > inconvenient in e.g. initramdisks, where the kernel is loaded from
> > outside the initramdisk.
> >
> > Making the kernel modules rrecommend kernel-image-<version> instead of
> > rdepending on it, makes it possible to install kernel modules without
> > the kernel image by setting "kernel-image" in BAD_RECOMMENDATIONS.
> >
> > Signed-off-by: Martin Hundebøll <mnhu@prevas.dk>
> > ---
> >  meta/classes/kernel-module-split.bbclass | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
> > index 1035525dac..78843c5474 100644
> > --- a/meta/classes/kernel-module-split.bbclass
> > +++ b/meta/classes/kernel-module-split.bbclass
> > @@ -120,6 +120,11 @@ python split_kernel_module_packages () {
> >                  rdepends[dep] = []
> >          d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))
> >
> > +        # let kernel modules runtime recommend kernel image
> > +        rrecommends = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
> > +        rrecommends['kernel-image'] = []
> > +        d.setVar('RRECOMMENDS_' + pkg, bb.utils.join_deps(rrecommends, commasep=False))
> > +
> >          # Avoid automatic -dev recommendations for modules ending with -dev.
> >          d.setVarFlag('RRECOMMENDS_' + pkg, 'nodeprrecs', 1)
> >
> > @@ -138,7 +143,7 @@ python split_kernel_module_packages () {
> >      postinst = d.getVar('pkg_postinst_modules')
> >      postrm = d.getVar('pkg_postrm_modules')
> >
> > -    modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='kernel-%s' % (d.getVar("KERNEL_VERSION")))
> > +    modules = do_split_packages(d, root='${nonarch_base_libdir}/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='')
> >      if modules:
> >          metapkg = d.getVar('KERNEL_MODULES_META_PACKAGE')
> >          d.appendVar('RDEPENDS_' + metapkg, ' '+' '.join(modules))
> > --
> > 2.14.1
> >
> 
> This breaks the method described in the kernel dev FAQ to omit the
> kernel image from the rootfs which is to set the following in a conf
> file:
> 
>     RDEPENDS_kernel-base = ""
> 
> See http://www.yoctoproject.org/docs/2.3.1/kernel-dev/kernel-dev.html#idm45690538384880.
> 
> By recommending kernel-image directly instead of recommending the
> top-level kernel-<version> package which was actually removed from
> extra_depends, we skip the inclusion of the kernel-base package. I'm
> not familiar enough with the details of kernel module loading to know
> if the 2 files in kernel-base (modules.builtin and modules.order) are
> strictly needed but I think they should at least be included in via
> recommendation.
> 
> As we already have a documented way to omit the kernel image, can we
> revert this?
> 
> As an alternative I can send in a patch which changes the recommend to
> the top-level kernel-<version> package instead of kernel-image.

FWIW, this was discussed at #yocto on IRC today. When I first saw the change 
several days ago, I was puzzled as well...
The existing method has been in use by many of us for a very long time and 
seems to be well documented - I also vote for reverting the change.

-- 
Denys

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Paul Barker]

On Fri, Sep 8, 2017 at 10:07 PM, Martin Hundebøll
<martin.hundeboll@prevas.dk> wrote:
>
>
> On September 8, 2017 10:37:26 PM GMT+02:00, Denys Dmytriyenko <denis@denix.org> wrote:
>>On Fri, Sep 08, 2017 at 09:06:17PM +0100, Paul Barker wrote:
>>>
>>> This breaks the method described in the kernel dev FAQ to omit the
>>> kernel image from the rootfs which is to set the following in a conf
>>> file:
>>>
>>>     RDEPENDS_kernel-base = ""
>>>
>>> See
>>http://www.yoctoproject.org/docs/2.3.1/kernel-dev/kernel-dev.html#idm45690538384880.
>>>
>>> By recommending kernel-image directly instead of recommending the
>>> top-level kernel-<version> package which was actually removed from
>>> extra_depends, we skip the inclusion of the kernel-base package. I'm
>>> not familiar enough with the details of kernel module loading to know
>>> if the 2 files in kernel-base (modules.builtin and modules.order) are
>>> strictly needed but I think they should at least be included in via
>>> recommendation.
>>>
>>> As we already have a documented way to omit the kernel image, can we
>>> revert this?
>>>
>>> As an alternative I can send in a patch which changes the recommend
>>to
>>> the top-level kernel-<version> package instead of kernel-image.
>>
>>FWIW, this was discussed at #yocto on IRC today. When I first saw the
>>change
>>several days ago, I was puzzled as well...
>>The existing method has been in use by many of us for a very long time
>>and
>>seems to be well documented - I also vote for reverting the change.
>
> Does setting `RDEPENDS_kernel-base = ""` in an image recipe work too?
>

No, you'd need it to be set in a conf file so it takes effect when the
kernel-base package is created.

I can see the issue here though. Can you set `RDEPENDS_kernel-base =
""` globally and explicitly install kernel-image into the appropriate
image? If not then yes we'll need to find an alternative solution to
simply reverting the change.

-- 
Paul Barker
Togán Labs Ltd

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Martin Hundebøll]

On 2017-09-08 23:29, Paul Barker wrote:
> On Fri, Sep 8, 2017 at 10:07 PM, Martin Hundebøll
> <martin.hundeboll@prevas.dk> wrote:
>>
>>
>> On September 8, 2017 10:37:26 PM GMT+02:00, Denys Dmytriyenko <denis@denix.org> wrote:
>>> On Fri, Sep 08, 2017 at 09:06:17PM +0100, Paul Barker wrote:
>>>>
>>>> This breaks the method described in the kernel dev FAQ to omit the
>>>> kernel image from the rootfs which is to set the following in a conf
>>>> file:
>>>>
>>>>      RDEPENDS_kernel-base = ""
>>>>
>>>> See
>>> http://www.yoctoproject.org/docs/2.3.1/kernel-dev/kernel-dev.html#idm45690538384880.
>>>>
>>>> By recommending kernel-image directly instead of recommending the
>>>> top-level kernel-<version> package which was actually removed from
>>>> extra_depends, we skip the inclusion of the kernel-base package. I'm
>>>> not familiar enough with the details of kernel module loading to know
>>>> if the 2 files in kernel-base (modules.builtin and modules.order) are
>>>> strictly needed but I think they should at least be included in via
>>>> recommendation.
>>>>
>>>> As we already have a documented way to omit the kernel image, can we
>>>> revert this?
>>>>
>>>> As an alternative I can send in a patch which changes the recommend
>>> to
>>>> the top-level kernel-<version> package instead of kernel-image.
>>>
>>> FWIW, this was discussed at #yocto on IRC today. When I first saw the
>>> change
>>> several days ago, I was puzzled as well...
>>> The existing method has been in use by many of us for a very long time
>>> and
>>> seems to be well documented - I also vote for reverting the change.
>>
>> Does setting `RDEPENDS_kernel-base = ""` in an image recipe work too?
>>
> 
> No, you'd need it to be set in a conf file so it takes effect when the
> kernel-base package is created.
> 
> I can see the issue here though. Can you set `RDEPENDS_kernel-base =
> ""` globally and explicitly install kernel-image into the appropriate
> image? If not then yes we'll need to find an alternative solution to
> simply reverting the change.
> 

Seems like the inverted approach of disabling install of kernel-image 
globally, and enabling it per-image works just fine.

Reverting the patch is fine by me - sorry for the noise.

// Martin

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Richard Purdie]

On Mon, 2017-09-11 at 09:02 +0200, Martin Hundebøll wrote:
> 
> On 2017-09-08 23:29, Paul Barker wrote:
> > 
> > On Fri, Sep 8, 2017 at 10:07 PM, Martin Hundebøll
> > <martin.hundeboll@prevas.dk> wrote:
> > > 
> > > 
> > No, you'd need it to be set in a conf file so it takes effect when
> > the
> > kernel-base package is created.
> > 
> > I can see the issue here though. Can you set `RDEPENDS_kernel-base
> > =
> > ""` globally and explicitly install kernel-image into the
> > appropriate
> > image? If not then yes we'll need to find an alternative solution
> > to
> > simply reverting the change.
> > 
> Seems like the inverted approach of disabling install of kernel-
> image 
> globally, and enabling it per-image works just fine.
> 
> Reverting the patch is fine by me - sorry for the noise.

Are you sure? I can't imagine being able to influence this at all from
an image recipe, either the dependency is present or its not and it
would be set from the global configuration, not from an image recipe...

Cheers,

Richard

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Martin Hundebøll]

On 2017-09-11 11:26, Richard Purdie wrote:
> On Mon, 2017-09-11 at 09:02 +0200, Martin Hundebøll wrote:
>>
>> On 2017-09-08 23:29, Paul Barker wrote:
>>>
>>> On Fri, Sep 8, 2017 at 10:07 PM, Martin Hundebøll
>>> <martin.hundeboll@prevas.dk> wrote:
>>>>
>>>>   
>>> No, you'd need it to be set in a conf file so it takes effect when
>>> the
>>> kernel-base package is created.
>>>
>>> I can see the issue here though. Can you set `RDEPENDS_kernel-base
>>> =
>>> ""` globally and explicitly install kernel-image into the
>>> appropriate
>>> image? If not then yes we'll need to find an alternative solution
>>> to
>>> simply reverting the change.
>>>
>> Seems like the inverted approach of disabling install of kernel-
>> image
>> globally, and enabling it per-image works just fine.
>>
>> Reverting the patch is fine by me - sorry for the noise.
> 
> Are you sure? I can't imagine being able to influence this at all from
> an image recipe, either the dependency is present or its not and it
> would be set from the global configuration, not from an image recipe...

Pretty sure, yes.

conf/distro/basic.conf:
RDEPENDS_kernel-base = ""

recipes-filesystems/rootfs.bb:
IMAGE_INSTALL += "kernel-image kernel-module-foo"

recipes-filesystems/rescuefs.bb:
IMAGE_INSTALL += "kernel-module-foo"

// Martin

Re: [PATCH v2] kernel-module-split: rrecommend kernel-image instead of rdepend

[Richard Purdie]

On Mon, 2017-09-11 at 14:19 +0200, Martin Hundebøll wrote:
> 
> On 2017-09-11 11:26, Richard Purdie wrote:
> > 
> > On Mon, 2017-09-11 at 09:02 +0200, Martin Hundebøll wrote:
> > > 
> > > Reverting the patch is fine by me - sorry for the noise.
> > Are you sure? I can't imagine being able to influence this at all
> > from
> > an image recipe, either the dependency is present or its not and it
> > would be set from the global configuration, not from an image
> > recipe...
> Pretty sure, yes.
> 
> conf/distro/basic.conf:
> RDEPENDS_kernel-base = ""
> 
> recipes-filesystems/rootfs.bb:
> IMAGE_INSTALL += "kernel-image kernel-module-foo"
> 
> recipes-filesystems/rescuefs.bb:
> IMAGE_INSTALL += "kernel-module-foo"

Now I understand, I thought you meant adding in the RRECOMMENDS from an
image recipe.

Thanks,

Richard