summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGratian Crisan <gratian.crisan@ni.com>2020-11-05 15:39:56 -0600
committerAnuj Mittal <anuj.mittal@intel.com>2020-11-17 11:45:12 +0800
commiteb42ef100c52b243eee55b950f3dc7d4010ea1f2 (patch)
tree7f3fdab021dc1def48c06e7e78b05a4c3d1f11eb
parente14646de7fb45605de33fc0b797dad013ec20414 (diff)
downloadopenembedded-core-contrib-eb42ef100c52b243eee55b950f3dc7d4010ea1f2.tar.gz
kernel-module-split.bbclass: identify kernel modconf files as configuration files
Currently the modconf fragments representing the configuration for kernel modules are written out to appropriate .conf files and added to the FILES variable. However they are not identified as 'configuration files' and installing a new version of a kernel module results in a conflict and a failed installed because the respective .conf file is already in place from a previous install. Add the generated .conf files to the CONFFILES variable denoting their true nature. Signed-off-by: Gratian Crisan <gratian.crisan@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1a70a92d1f1006be115429a4262259c9084f484d) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--meta/classes/kernel-module-split.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 221022b7bc..c8ede26996 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,6 +120,7 @@ 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)
if "description" in vals:
old_desc = d.getVar('DESCRIPTION_' + pkg) or ""