diff options
| author |   Gratian Crisan <gratian.crisan@ni.com> | 2020-12-04 13:30:21 -0600 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-12-10 04:11:06 -1000 |
| commit | f1f904ebf2aef54c4c867d5d2c842ec5d53d3c78 (patch) | |
| tree | 3af3cabee9ce36c0c310622fd0b33dc85073e654 /meta/classes | |
| parent | a4944e9b553ddf55da9d9a1243fadc93a620b003 (diff) | |
| download | openembedded-core-contrib-f1f904ebf2aef54c4c867d5d2c842ec5d53d3c78.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>
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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/kernel-module-split.bbclass | 5 |
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 () { 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 "" |