From db5f2ca532db4f0d2e05b7cb5f9d146e1dd76ab3 Mon Sep 17 00:00:00 2001 From: Gratian Crisan Date: Fri, 4 Dec 2020 13:30:21 -0600 Subject: 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") Reported-by: Yi Zhao Signed-off-by: Gratian Crisan Signed-off-by: Richard Purdie --- 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 "" -- cgit 1.2.3-korg