From 1a70a92d1f1006be115429a4262259c9084f484d Mon Sep 17 00:00:00 2001 From: Gratian Crisan Date: Thu, 5 Nov 2020 15:39:56 -0600 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/kernel-module-split.bbclass | 1 + 1 file changed, 1 insertion(+) 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 "" -- cgit 1.2.3-korg