summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorGratian Crisan <gratian.crisan@ni.com>2020-12-04 13:30:21 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-18 14:20:19 +0000
commit7ac0a2f6a07605fd9d89a7f7b902285c6fab882d (patch)
treebcd0e100a1e6e4965d22118b699cf5fb612561c0 /meta
parent7409f5bd4518608ffe12b3ba87b849876ad5cbff (diff)
downloadpoky-7ac0a2f6a07605fd9d89a7f7b902285c6fab882d.tar.gz
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 <yi.zhao@windriver.com> (From OE-Core rev: f1f904ebf2aef54c4c867d5d2c842ec5d53d3c78) Signed-off-by: Gratian Crisan <gratian.crisan@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit db5f2ca532db4f0d2e05b7cb5f9d146e1dd76ab3) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-module-split.bbclass5
1 files changed, 4 insertions, 1 deletions
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 () {
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 conffiles = d.getVar('CONFFILES_%s' % pkg)
125 conffiles = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (conffiles, basename, basename)
126 d.setVar('CONFFILES_%s' % pkg, conffiles)
124 127
125 if "description" in vals: 128 if "description" in vals:
126 old_desc = d.getVar('DESCRIPTION_' + pkg) or "" 129 old_desc = d.getVar('DESCRIPTION_' + pkg) or ""