[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7319/8267] kernel-module-split: rrecommend kernel-image instead of rdepend

[Emmanuele Bassi <ebassi src gnome org>]

commit e0ed52c51464855e9a6a37ea49df7efde7e91076
Author: Martin Hundebøll <mnhu prevas dk>
Date:   Mon Aug 21 11:21:34 2017 +0200

    kernel-module-split: rrecommend kernel-image instead of rdepend
    
    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.
    
    (From OE-Core rev: 5dd7ddb66a6846d9bb59dc7833e8318992d0e645)
    
    Signed-off-by: Martin Hundebøll <mnhu prevas dk>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-module-split.bbclass |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 1035525..78843c5 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))