Changeset 31911 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Aug 24, 2010 11:56:45 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65121

Message:

make the VBOX_WITH_NEW_USB_CODE_ON_SOLARIS code mandatory

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -163 +163 @@
         $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf) \
         $(if $(VBOX_WITH_USB),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf) \
-        $(if $(VBOX_WITH_NEW_USB_CODE_ON_SOLARIS),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf)
+        $(if $(VBOX_WITH_USB),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusb.conf)
 
 #
@@ -185 +185 @@
         $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
 
-ifdef VBOX_WITH_USB
- ifndef VBOX_WITH_NEW_USB_CODE_ON_SOLARIS
-        SOLARIS_STRIP_EXES += VBoxUSBHelper
- endif
-endif
-
 SOLARIS_DRIVER_BINS = \
         vboxdrv \
@@ -196 +190 @@
         $(if $(VBOX_WITH_NETADP),vboxnet,) \
         $(if $(VBOX_WITH_USB),vboxusbmon,) \
-        $(if $(VBOX_WITH_NEW_USB_CODE_ON_SOLARIS),vboxusb,)
+        $(if $(VBOX_WITH_USB),vboxusb,)
 
 SOLARIS_DRIVER_CONFS = \
@@ -203 +197 @@
         $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \
         $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \
-        $(if $(VBOX_WITH_NEW_USB_CODE_ON_SOLARIS),vboxusb.conf,)
+        $(if $(VBOX_WITH_USB),vboxusb.conf,)
 
 # Strip these binaries