summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2016-08-18 08:56:25 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-09 11:53:36 +0100
commitdf1635e5fb807609ce0e069c29d9ba729a065a18 (patch)
tree8a6c408644573b06042be9063371ce94df0a5c0f
parentfe90376acae1335c430ec400b8ada9ab3d536ee2 (diff)
downloadpoky-df1635e5fb807609ce0e069c29d9ba729a065a18.tar.gz
kernel-module-split.bbclass: generate dependencies across recipes
The information retrieved via depmod is incomplete with regards to kernel modules that are dependencies, in particular where two kernel modules are built from different source trees / recipes, which leads to incomplete dependency information for packages created. So far, our packages created didn't contain dependencies on packages created by other recipes, as we solely use depmod for that, and depmod can only work well after *all* kernel modules have been copied into one place - it doesn't work well in a staged approach. Now that all .ko have correct dependency information at packaging time, we can use that information to properly track dependencies across recipies, and can combine the information from the .modinfo elf section with the information from depmod. (From OE-Core rev: e4af1fa3aee7f1cf00ca27944b10b886f41f2fda) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-module-split.bbclass10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index ed42d2b19d..db0ad3367a 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -173,7 +173,15 @@ python split_kernel_module_packages () {
173 d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"]) 173 d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
174 174
175 rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "") 175 rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg, True) or "")
176 for dep in get_dependencies(file, pattern, format): 176 modinfo_deps = []
177 if "depends" in vals and vals["depends"] != "":
178 for dep in vals["depends"].split(","):
179 on = legitimize_package_name(dep)
180 dependency_pkg = format % on
181 modinfo_deps.append(dependency_pkg)
182 depmod_deps = get_dependencies(file, pattern, format)
183 all_deps = list(set(modinfo_deps + depmod_deps))
184 for dep in all_deps:
177 if not dep in rdepends: 185 if not dep in rdepends:
178 rdepends[dep] = [] 186 rdepends[dep] = []
179 d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False)) 187 d.setVar('RDEPENDS_' + pkg, bb.utils.join_deps(rdepends, commasep=False))