summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorGratian Crisan <gratian.crisan@ni.com>2020-11-05 21:39:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-20 10:44:34 (GMT)
commit8d40fce484b1940c200182ae710330157c868645 (patch)
treea7ff082e18e3a3cf9f4cd02c48047eda3094f5fe /meta/classes
parentd81bae241c63d2a24c9c1d785072e21ccd5ad7a1 (diff)
downloadpoky-8d40fce484b1940c200182ae710330157c868645.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. (From OE-Core rev: b5a113273dc4c062a4b734a403a3bb4a5e92c8ee) 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: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 221022b..c8ede26 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -120,6 +120,7 @@ python split_kernel_module_packages () {
120 files = d.getVar('FILES_%s' % pkg) 120 files = d.getVar('FILES_%s' % pkg)
121 files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename) 121 files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
122 d.setVar('FILES_%s' % pkg, files) 122 d.setVar('FILES_%s' % pkg, files)
123 d.setVar('CONFFILES_%s' % pkg, files)
123 124
124 if "description" in vals: 125 if "description" in vals:
125 old_desc = d.getVar('DESCRIPTION_' + pkg) or "" 126 old_desc = d.getVar('DESCRIPTION_' + pkg) or ""