summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel.bbclass35
-rw-r--r--meta/classes/linux-kernel-base.bbclass4
2 files changed, 0 insertions, 39 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 56e3946c4a..2eea6ed1df 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -307,10 +307,6 @@ python populate_packages_prepend () {
307 continue 307 continue
308 on = legitimize_package_name(m.group(1)) 308 on = legitimize_package_name(m.group(1))
309 dependency_pkg = format % on 309 dependency_pkg = format % on
310 v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
311 if v == "1":
312 kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)
313 dependency_pkg = "%s-%s" % (dependency_pkg, kv)
314 dependencies.append(dependency_pkg) 310 dependencies.append(dependency_pkg)
315 return dependencies 311 return dependencies
316 return [] 312 return []
@@ -387,35 +383,4 @@ python populate_packages_prepend () {
387 packages.append(metapkg) 383 packages.append(metapkg)
388 bb.data.setVar('PACKAGES', ' '.join(packages), d) 384 bb.data.setVar('PACKAGES', ' '.join(packages), d)
389 385
390 v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
391 if v == "1":
392 kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)
393 packages = bb.data.getVar("PACKAGES", d, 1).split()
394 module_re = re.compile("^kernel-module-")
395
396 newmetapkg = "kernel-modules-%s" % kv
397 bb.data.setVar('ALLOW_EMPTY_' + newmetapkg, "1", d)
398 bb.data.setVar('FILES_' + newmetapkg, "", d)
399
400 newmetapkg_rdepends = []
401
402 for p in packages:
403 if not module_re.match(p):
404 continue
405 pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p
406 newpkg = "%s-%s" % (pkg, kv)
407 bb.data.setVar("PKG_%s" % p, newpkg, d)
408 rprovides = bb.data.getVar("RPROVIDES_%s" % p, d, 1)
409 if rprovides:
410 rprovides = "%s %s" % (rprovides, pkg)
411 else:
412 rprovides = pkg
413 bb.data.setVar("RPROVIDES_%s" % p, rprovides, d)
414 newmetapkg_rdepends.append(newpkg)
415
416 bb.data.setVar('RDEPENDS_' + newmetapkg, ' '.join(newmetapkg_rdepends), d)
417 bb.data.setVar('DESCRIPTION_' + newmetapkg, 'Kernel modules meta package', d)
418 packages.append(newmetapkg)
419 bb.data.setVar('PACKAGES', ' '.join(packages), d)
420
421} 386}
diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass
index e58c228080..4e2e2da373 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/meta/classes/linux-kernel-base.bbclass
@@ -32,10 +32,6 @@ def get_kernelmajorversion(p):
32def linux_module_packages(s, d): 32def linux_module_packages(s, d):
33 import bb, os.path 33 import bb, os.path
34 suffix = "" 34 suffix = ""
35 if (bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) == "1"):
36 file = bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d)
37 if (os.path.exists(file)):
38 suffix = "-%s" % (get_kernelmajorversion(base_read_file(file)))
39 return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) 35 return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split()))
40 36
41# that's all 37# that's all