[oe-commits] org.oe.dev kernel.bbclass: Remove PARALLEL_INSTALL_MODULES. If we want to do this we should rethink and have something that works for multiple kernel versions generically not just a 2.4/2.6 split. There are certainly better ways to do it than this.

[rpurdie commit]

kernel.bbclass: Remove PARALLEL_INSTALL_MODULES. If we want to do this we should rethink and have something that works for multiple kernel versions generically not just a 2.4/2.6 split. There are certainly better ways to do it than this.

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 50c9ee81517d5a1c32a7a7afe7a00793aabceb33
ViewMTN: http://monotone.openembedded.org/revision.psp?id=50c9ee81517d5a1c32a7a7afe7a00793aabceb33
Files:
1
classes/kernel.bbclass
classes/linux-kernel-base.bbclass
classes/module.bbclass
Diffs:

#
# mt diff -r21630f452d818de792f1770f867e2ab625291266 -r50c9ee81517d5a1c32a7a7afe7a00793aabceb33
#
# 
# 
# patch "classes/kernel.bbclass"
#  from [243e79023c03deb48ce808d6cf89883c2ba8230b]
#    to [237ec9e436415eab3772495898c0921de38b3c07]
# 
# patch "classes/linux-kernel-base.bbclass"
#  from [318da7ebdc85b8e7fadcd99d5f4ce482b885e797]
#    to [3adb1ef66fa023473987291be892515e88a8d0ab]
# 
# patch "classes/module.bbclass"
#  from [cf6a1004ebfb717a7dc9fb4cce9e7932ea9336aa]
#    to [b4a2435539a6183bfff6b02bc73785bbceeadef6]
# 
============================================================
--- classes/kernel.bbclass	243e79023c03deb48ce808d6cf89883c2ba8230b
+++ classes/kernel.bbclass	237ec9e436415eab3772495898c0921de38b3c07
@@ -307,10 +307,6 @@ python populate_packages_prepend () {
 					continue
 				on = legitimize_package_name(m.group(1))
 				dependency_pkg = format % on
-        			v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
-	        		if v == "1":
-		                	kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)
-					dependency_pkg = "%s-%s" % (dependency_pkg, kv)
 				dependencies.append(dependency_pkg)
 			return dependencies
 		return []
@@ -386,36 +382,4 @@ python populate_packages_prepend () {
 	bb.data.setVar('DESCRIPTION_' + metapkg, 'Kernel modules meta package', d)
 	packages.append(metapkg)
 	bb.data.setVar('PACKAGES', ' '.join(packages), d)
-
-	v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
-	if v == "1":
-		kv = bb.data.getVar("KERNEL_MAJOR_VERSION", d, 1)
-		packages = bb.data.getVar("PACKAGES", d, 1).split()
-		module_re = re.compile("^kernel-module-")
-
-		newmetapkg = "kernel-modules-%s" % kv
-		bb.data.setVar('ALLOW_EMPTY_' + newmetapkg, "1", d)
-		bb.data.setVar('FILES_' + newmetapkg, "", d)
-
-		newmetapkg_rdepends = []
-
-		for p in packages:
-			if not module_re.match(p):
-				continue
-			pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p
-			newpkg = "%s-%s" % (pkg, kv)
-			bb.data.setVar("PKG_%s" % p, newpkg, d)
-			rprovides = bb.data.getVar("RPROVIDES_%s" % p, d, 1)
-			if rprovides:
-				rprovides = "%s %s" % (rprovides, pkg)
-			else:
-				rprovides = pkg
-			bb.data.setVar("RPROVIDES_%s" % p, rprovides, d)
-			newmetapkg_rdepends.append(newpkg)
-
-		bb.data.setVar('RDEPENDS_' + newmetapkg, ' '.join(newmetapkg_rdepends), d)
-		bb.data.setVar('DESCRIPTION_' + newmetapkg, 'Kernel modules meta package', d)
-		packages.append(newmetapkg)
-		bb.data.setVar('PACKAGES', ' '.join(packages), d)
-
 }
============================================================
--- classes/linux-kernel-base.bbclass	318da7ebdc85b8e7fadcd99d5f4ce482b885e797
+++ classes/linux-kernel-base.bbclass	3adb1ef66fa023473987291be892515e88a8d0ab
@@ -32,10 +32,6 @@ def linux_module_packages(s, d):
 def linux_module_packages(s, d):
 	import bb, os.path
 	suffix = ""
-	if (bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) == "1"):
-		file = bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d)
-		if (os.path.exists(file)):
-		     suffix = "-%s" % (get_kernelmajorversion(base_read_file(file)))
 	return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split()))
 
 # that's all
============================================================
--- classes/module.bbclass	cf6a1004ebfb717a7dc9fb4cce9e7932ea9336aa
+++ classes/module.bbclass	b4a2435539a6183bfff6b02bc73785bbceeadef6
@@ -1,25 +1,8 @@ inherit module-base
 RDEPENDS += "kernel (${KERNEL_VERSION})"
 DEPENDS += "virtual/kernel"
 
 inherit module-base
 
-python populate_packages_prepend() {
-	v = bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) or "0"
-	if v == "1":
-		kv = bb.data.getVar("KERNEL_VERSION", d, 1)
-		packages = bb.data.getVar("PACKAGES", d, 1)
-		for p in packages.split():
-			pkg = bb.data.getVar("PKG_%s" % p, d, 1) or p
-			newpkg = "%s-%s" % (pkg, kv)
-			bb.data.setVar("PKG_%s" % p, newpkg, d)
-			rprovides = bb.data.getVar("RPROVIDES_%s" % p, d, 1)
-			if rprovides:
-				rprovides = "%s %s" % (rprovides, pkg)
-			else:
-				rprovides = pkg
-			bb.data.setVar("RPROVIDES_%s" % p, rprovides, d)
-}
-
 module_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
 	oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR}   \