Loading...
--- xnu/xnu-792/libsa/kext.cpp
+++ xnu/xnu-517.7.7/libsa/kext.cpp
@@ -335,11 +335,9 @@
static bool
figureDependenciesForKext(OSDictionary * kextPlist,
OSDictionary * dependencies,
- OSString * trueParent,
- Boolean skipKernelDependencies)
+ OSString * trueParent)
{
bool result = true;
- bool hasDirectKernelDependency = false;
OSString * kextName = 0; // don't release
OSDictionary * libraries = 0; // don't release
OSCollectionIterator * keyIterator = 0; // must release
@@ -381,26 +379,9 @@
result = false;
goto finish;
} else {
- char is_kernel_component;
-
- if (!kextIsDependency(libraryName->getCStringNoCopy(), &is_kernel_component))
- is_kernel_component = false;
-
- if (!skipKernelDependencies || !is_kernel_component) {
- dependencies->setObject(libraryName,
- trueParent ? trueParent : kextName);
- }
- if (!hasDirectKernelDependency && is_kernel_component) {
- hasDirectKernelDependency = true;
- }
- }
- }
- if (!hasDirectKernelDependency) {
- /* a kext without any kernel dependency is assumed dependent on 6.0 */
- dependencies->setObject("com.apple.kernel.libkern",
+ dependencies->setObject(libraryName,
trueParent ? trueParent : kextName);
- IOLog("Extension \"%s\" has no kernel dependency.\n",
- kextName->getCStringNoCopy());
+ }
}
finish:
@@ -523,7 +504,7 @@
goto finish;
}
- if (!figureDependenciesForKext(kextPlist, workingDependencies, NULL, false)) {
+ if (!figureDependenciesForKext(kextPlist, workingDependencies, NULL)) {
IOLog("can't determine immediate dependencies for extension %s\n",
kmod_name);
result = false;
@@ -589,7 +570,7 @@
* binaryless, dependency.
*/
if (!figureDependenciesForKext(kextPlist, pendingDependencies,
- dependentName, true)) {
+ dependentName)) {
IOLog("can't determine immediate dependencies for extension %s\n",
library_name);
@@ -653,7 +634,7 @@
/* Now put the library's dependencies onto the pending set.
*/
if (!figureDependenciesForKext(kextPlist, pendingDependencies,
- NULL, false)) {
+ NULL)) {
IOLog("can't determine immediate dependencies for extension %s\n",
library_name);