Changeset 24424 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 6, 2009 7:27:56 AM (15 years ago)

Author:

vboxsync

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

54476

Message:

Solaris/Installer: usb fixes.

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• makepackage.sh (modified) (1 diff)

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

@@ -182 +182 @@
         $(if $(VBOX_WITH_VBOXBFE),VBoxBFE,) \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
-        $(if $(VBOX_WITH_USB),VBoxUSBHelper,) \
         $(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
         VBoxNetDHCP \
@@ -189 +188 @@
         VBoxXPCOMIPCD \
         kchmviewer
+
+ifdef VBOX_WITH_USB
+ ifndef VBOX_WITH_NEW_USB_CODE_ON_SOLARIS
+        SOLARIS_STRIP_EXES += VBoxUSBHelper
+ endif
+endif
 
 SOLARIS_DRIVER_BINS = \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -163 +163 @@
 filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/vboxusbmon"'                                '$6 = "sys"'
 filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/amd64/vboxusbmon"'                          '$6 = "sys"'
+
+# USB Client vboxusb
+filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/vboxusb"'                                   '$6 = "sys"'
+filelist_fixup prototype '$3 == "platform/i86pc/kernel/drv/amd64/vboxusb"'                             '$6 = "sys"'
 
 # hardening requires some executables to be marked setuid.