[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4548/8267] kernel-module-split: Allow custom suffix for package names



commit 36e7717efecd36663b206c416f60aacff1f11257
Author: Andreas Oberritter <obi opendreambox org>
Date:   Mon Feb 6 22:41:56 2017 +0100

    kernel-module-split: Allow custom suffix for package names
    
    This makes it possible to restore the behaviour changed by commit 78cde87
    "kernel-module-split: Append KERNEL_VERSION string to kernel module name".
    
    (From OE-Core rev: 4aabdddf67859cd8518e5cb672fb391c859817e0)
    
    Signed-off-by: Andreas Oberritter <obi opendreambox org>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-module-split.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index db332e5..ba9cc15 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -33,6 +33,7 @@ PACKAGESPLITFUNCS_prepend = "split_kernel_module_packages "
 KERNEL_MODULES_META_PACKAGE ?= "kernel-modules"
 
 KERNEL_MODULE_PACKAGE_PREFIX ?= ""
+KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${KERNEL_VERSION}"
 KERNEL_MODULE_PROVIDE_VIRTUAL ?= "1"
 
 python split_kernel_module_packages () {
@@ -131,7 +132,8 @@ python split_kernel_module_packages () {
     module_regex = '^(.*)\.k?o$'
 
     module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX')
-    module_pattern = module_pattern_prefix + 'kernel-module-%s-' + d.getVar("KERNEL_VERSION")
+    module_pattern_suffix = d.getVar('KERNEL_MODULE_PACKAGE_SUFFIX')
+    module_pattern = module_pattern_prefix + 'kernel-module-%s' + module_pattern_suffix
 
     postinst = d.getVar('pkg_postinst_modules')
     postrm = d.getVar('pkg_postrm_modules')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]