diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2017-02-06 22:41:56 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-07 14:50:10 +0000 |
commit | 36e7717efecd36663b206c416f60aacff1f11257 (patch) | |
tree | 30a9d8eab4cc8c5238ce9af13c977dd928c89c20 /meta | |
parent | 3990b5eb94a2097b623751c593e726240ff5302b (diff) | |
download | poky-36e7717efecd36663b206c416f60aacff1f11257.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | 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 db332e57ab..ba9cc1517e 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 " | |||
33 | KERNEL_MODULES_META_PACKAGE ?= "kernel-modules" | 33 | KERNEL_MODULES_META_PACKAGE ?= "kernel-modules" |
34 | 34 | ||
35 | KERNEL_MODULE_PACKAGE_PREFIX ?= "" | 35 | KERNEL_MODULE_PACKAGE_PREFIX ?= "" |
36 | KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${KERNEL_VERSION}" | ||
36 | KERNEL_MODULE_PROVIDE_VIRTUAL ?= "1" | 37 | KERNEL_MODULE_PROVIDE_VIRTUAL ?= "1" |
37 | 38 | ||
38 | python split_kernel_module_packages () { | 39 | python split_kernel_module_packages () { |
@@ -131,7 +132,8 @@ python split_kernel_module_packages () { | |||
131 | module_regex = '^(.*)\.k?o$' | 132 | module_regex = '^(.*)\.k?o$' |
132 | 133 | ||
133 | module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX') | 134 | module_pattern_prefix = d.getVar('KERNEL_MODULE_PACKAGE_PREFIX') |
134 | module_pattern = module_pattern_prefix + 'kernel-module-%s-' + d.getVar("KERNEL_VERSION") | 135 | module_pattern_suffix = d.getVar('KERNEL_MODULE_PACKAGE_SUFFIX') |
136 | module_pattern = module_pattern_prefix + 'kernel-module-%s' + module_pattern_suffix | ||
135 | 137 | ||
136 | postinst = d.getVar('pkg_postinst_modules') | 138 | postinst = d.getVar('pkg_postinst_modules') |
137 | postrm = d.getVar('pkg_postrm_modules') | 139 | postrm = d.getVar('pkg_postrm_modules') |