Skip to contentSkip to conversation

kernel-module-split.bbclass: fix kernel modules getting marked as CONFFILES

PATCH New Gratian Crisan 1 participant 1 message Dec 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel-module-split.bbclass: fix kernel modules getting marked as CONFFILES

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")
---
 meta/classes/kernel-module-split.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/classes/kernel-module-split.bbclass +4 -1
index c8ede26996..baa32e0a90 100644
@@ -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.29.2