From: Gratian Crisan <gratian.cri...@ni.com>
Yi pointed out that commit 1a70a92d1f10 ("kernel-module-split.bbclass:
identify kernel modconf files as configuration files") is
unintentionally adding the actual kernel /lib/modules .ko files to the
CONFFILES variable.
The root cause is the re-use of the 'files' variable in that commit.
Fix it by using a separate variable to keep track of the generated
module .conf files that need to be marked as configuration files.
Fixes: 1a70a92d1f10 ("kernel-module-split.bbclass: identify kernel modconf
files as configuration files")
Reported-by: Yi Zhao <yi.z...@windriver.com>
Signed-off-by: Gratian Crisan <gratian.cri...@ni.com>
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org>
(cherry picked from commit db5f2ca532db4f0d2e05b7cb5f9d146e1dd76ab3)
Signed-off-by: Steve Sakoman <st...@sakoman.com>
---
meta/classes/kernel-module-split.bbclass | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/classes/kernel-module-split.bbclass
b/meta/classes/kernel-module-split.bbclass
index c8ede26996..baa32e0a90 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,7 +120,10 @@ python split_kernel_module_packages () {
files = d.getVar('FILES_%s' % pkg)
files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" %
(files, basename, basename)
d.setVar('FILES_%s' % pkg, files)
- d.setVar('CONFFILES_%s' % pkg, files)
+
+ conffiles = d.getVar('CONFFILES_%s' % pkg)
+ conffiles = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" %
(conffiles, basename, basename)
+ d.setVar('CONFFILES_%s' % pkg, conffiles)
if "description" in vals:
old_desc = d.getVar('DESCRIPTION_' + pkg) or ""
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#145578):
https://lists.openembedded.org/g/openembedded-core/message/145578
Mute This Topic: https://lists.openembedded.org/mt/78951381/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
