Changeset 16719 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 13, 2009 12:11:24 AM (16 years ago)

Author:

vboxsync

Message:

Config,VBoxDrv: Updated VBOXR0DRV and VBoxDrv to work with 10a261. The main trick was using the right options: -XLinker -kext and -mkernel. We used to link it as a static (MH_OBJECT) but that no longer works. Also, kextload doesn't work for development purposes, so we'll have to use kextutil instead.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (2 diffs)
• darwin/Info-SnowLeopard.plist (copied) (copied from trunk/src/VBox/HostDrivers/Support/darwin/Info.plist ) (1 diff)
• darwin/load.sh (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -338 +338 @@
 VBoxDrv.kext_CLEAN    = $(PATH_VBoxDrv.kext)/Info.plist
 
-$$(PATH_VBoxDrv.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info.plist $(VBOX_VERSION_MK) | $$(dir $$@)
+$$(PATH_VBoxDrv.kext)/Info.plist: \
+                $(PATH_SUB_CURRENT)/darwin/Info$(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64",-SnowLeopard,).plist \
+                $(VBOX_VERSION_MK) | $$(dir $$@)
         $(call MSG_GENERATE,VBoxDrv,$@,$<)
         $(xQUIET)$(RM) -f $@
@@ -346 +348 @@
                 -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
                 -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-                $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64",-e '/com\.apple\.kernel/d',) \
                 --output $@ \
                 $<

trunk/src/VBox/HostDrivers/Support/darwin/Info-SnowLeopard.plist

@@ -28 +28 @@
     <key>OSBundleLibraries</key>
     <dict>
-        <key>com.apple.kpi.bsd</key>            <string>8.8.1</string>
-        <key>com.apple.kpi.mach</key>           <string>8.8.1</string>
-        <key>com.apple.kpi.libkern</key>        <string>8.8.1</string>
-        <key>com.apple.kpi.unsupported</key>    <string>8.8.1</string>
-        <key>com.apple.kpi.iokit</key>          <string>8.8.1</string>
-        <key>com.apple.kernel.bsd</key>         <string>7.9.9</string>
-        <key>com.apple.kernel.mach</key>        <string>7.9.9</string>
+        <key>com.apple.kpi.bsd</key>            <string>10.0.0d4</string>
+        <key>com.apple.kpi.mach</key>           <string>10.0.0d3</string>
+        <key>com.apple.kpi.libkern</key>        <string>10.0.0d3</string>
+        <key>com.apple.kpi.iokit</key>          <string>10.0.0d3</string>
+        <key>com.apple.kpi.unsupported</key>    <string>10.0.0d3</string>
     </dict>
 </dict>

trunk/src/VBox/HostDrivers/Support/darwin/load.sh

@@ -127 +127 @@
 sync
 echo "load.sh: loading $DIR..."
-sudo kextload $OPTS "$DIR"
+
+if [ "$XNU_VERSION" -ge "10" ]; then
+    sudo kextutil $OPTS "$DIR"
+else
+    sudo kextload $OPTS "$DIR"
+fi
 sync
 sudo chown -R `whoami` "$DIR"