Changeset 29844 in vbox for trunk/src

Timestamp:

May 27, 2010 11:25:52 AM (15 years ago)

Author:

vboxsync

Message:

HostDrivers-OSX: removed Tiger support

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/Makefile.kmk (modified) (1 diff)
• Support/darwin/Info-Tiger.plist (deleted)
• Support/darwin/load.sh (modified) (2 diffs)
• VBoxNetAdp/darwin/loadnetadp.sh (modified) (2 diffs)
• VBoxNetFlt/darwin/loadnetflt.sh (modified) (2 diffs)

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

@@ -319 +319 @@
 #
 ifeq ($(KBUILD_TARGET),darwin)
-# The Tiger variant.
-SYSMODS.x86 += VBoxDrvTiger
-VBoxDrvTiger_TEMPLATE    = VBOXR0DRV
-VBoxDrvTiger_INST        = $(INST_VBOXDRV_TIGER)Contents/MacOS/
-VBoxDrvTiger_DEFS       := IN_RT_R0 IN_SUP_R0 SUPDRV_WITH_RELEASE_LOGGER VBOX_SVN_REV=$(VBOX_SVN_REV)
-VBoxDrvTiger_DEFS.debug += DEBUG_DARWIN_GIP
-VBoxDrvTiger_INCS        = .
-VBoxDrvTiger_LIBS        = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
-#VBoxDrvTiger_LDFLAGS     = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
-VBoxDrvTiger_SOURCES     = \
+# Leopard (x86) and Snow Leopard (x86/amd64)
+SYSMODS += VBoxDrv
+VBoxDrv_TEMPLATE    = VBOXR0DRV$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",OSX105,)
+VBoxDrv_INST        = $(INST_VBOXDRV)Contents/MacOS/
+VBoxDrv_DEFS       := VBOX_WITH_HOST_VMX IN_RT_R0 IN_SUP_R0 SUPDRV_WITH_RELEASE_LOGGER VBOX_SVN_REV=$(VBOX_SVN_REV)
+VBoxDrv_DEFS.debug  = DEBUG_DARWIN_GIP
+VBoxDrv_INCS        = .
+VBoxDrv_LIBS        = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
+#VBoxDrv_LDFLAGS     = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
+VBoxDrv_SOURCES     = \
         SUPDrv.c \
         SUPDrvSem.c \
         $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).cpp
-
-INSTALLS += VBoxDrvTiger.kext
-VBoxDrvTiger.kext_INST     = $(INST_VBOXDRV_TIGER)Contents/
-VBoxDrvTiger.kext_SOURCES  = $(PATH_VBoxDrvTiger.kext)/Info.plist
-VBoxDrvTiger.kext_CLEAN    = $(PATH_VBoxDrvTiger.kext)/Info.plist
-
-$$(PATH_VBoxDrvTiger.kext)/Info.plist: $(PATH_SUB_CURRENT)/darwin/Info-Tiger.plist $(VBOX_VERSION_MK) | $$(dir $$@)
-        $(call MSG_GENERATE,VBoxDrvTiger,$@,$<)
-        $(QUIET)$(RM) -f $@
-        $(QUIET)$(SED) \
-                -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-                -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-                -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-                -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-                --output $@ \
-                $<
-
-# The Leopard variant.
-SYSMODS += VBoxDrv
-VBoxDrv_EXTENDS    = VBoxDrvTiger
-VBoxDrv_EXTENDS_BY = appending
-VBoxDrv_TEMPLATE   = VBOXR0DRV$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",OSX105,)
-VBoxDrv_INST       = $(INST_VBOXDRV)Contents/MacOS/
-VBoxDrv_DEFS       = VBOX_WITH_HOST_VMX
 
 INSTALLS += VBoxDrv.kext

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

@@ -6 +6 @@
 
 #
-# Copyright (C) 2006-2007 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -27 +27 @@
 
 XNU_VERSION=`LC_ALL=C uname -r | LC_ALL=C cut -d . -f 1`
-if [ "$XNU_VERSION" -ge "9" ]; then
-  DRVNAME="VBoxDrv.kext"
-else
-  DRVNAME="VBoxDrvTiger.kext"
-fi
+DRVNAME="VBoxDrv.kext"
 BUNDLE="org.virtualbox.kext.VBoxDrv"
 

trunk/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2008 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 BUNDLE="org.virtualbox.kext.VBoxNetAdp"
 
-if [ "$XNU_VERSION" -ge "9" ]; then
-    DEP_DRVNAME="VBoxDrv.kext"
-else
-    DEP_DRVNAME="VBoxDrvTiger.kext"
-fi
+DEP_DRVNAME="VBoxDrv.kext"
 DEP_BUNDLE="org.virtualbox.kext.VBoxDrv"
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/darwin/loadnetflt.sh

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2008 Oracle Corporation
+# Copyright (C) 2006-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -22 +22 @@
 BUNDLE="org.virtualbox.kext.VBoxNetFlt"
 
-if [ "$XNU_VERSION" -ge "9" ]; then
-    DEP_DRVNAME="VBoxDrv.kext"
-else
-    DEP_DRVNAME="VBoxDrvTiger.kext"
-fi
+DEP_DRVNAME="VBoxDrv.kext"
 DEP_BUNDLE="org.virtualbox.kext.VBoxDrv"