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

Timestamp:

Jan 23, 2013 8:27:12 PM (12 years ago)

Author:

vboxsync

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

83302

Message:

Installer/solaris,Installer/freebsd: Follow the Windows & Linux examples wrt VBoxBFE.

Location:

trunk/src/VBox/Installer

Files:

• freebsd/Makefile.kmk (modified) (2 diffs)
• solaris/Makefile.kmk (modified) (3 diffs)

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

@@ -203 +203 @@
 endif
 
-# BFE
-ifdef VBOX_WITH_VBOXBFE
- VBOX_FBSD_STRIP_BIN += \
-        VBoxBFE \
-        $(if $(VBOX_WITH_HARDENING),VBoxBFE.so)
- VBOX_FBSD_SYMLINKS += \
-        VBoxBFE
-endif
+## VBoxBFE - Follow the example set by Windows and Linux.
+#ifdef VBOX_WITH_VBOXBFE
+# VBOX_FBSD_STRIP_BIN += \
+#       VBoxBFE \
+#       $(if $(VBOX_WITH_HARDENING),VBoxBFE.so)
+# VBOX_FBSD_SYMLINKS += \
+#       VBoxBFE
+#endif
 
 # Webservices
@@ -323 +323 @@
                 -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \
                 -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \
+                -e "/VBoxBFE/d" \
                 --output $@ \
                 $<

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

@@ -207 +207 @@
         $(if $(VBOX_WITH_QTGUI),VirtualBox,) \
         VBoxManage \
-        $(if $(VBOX_WITH_VBOXBFE),VBoxBFE,) \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
         $(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
@@ -216 +215 @@
         VBoxXPCOMIPCD \
         $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)
+## Follow the Windows + Linux example of not shipping VBoxBFE.
+#SOLARIS_STRIP_EXES = \
+#       $(if $(VBOX_WITH_VBOXBFE),VBoxBFE,)
 
 SOLARIS_DRIVER_BINS = \
@@ -270 +272 @@
 SOLARIS_STRIP_BINS += \
         VBoxNetDHCP.so \
-        $(if $(VBOX_WITH_VBOXBFE),VBoxBFE.so,) \
         $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \
         $(if $(VBOX_WITH_QTGUI),VirtualBox.so,)
+## Follow the Windows + Linux example of not shipping VBoxBFE.
+#SOLARIS_STRIP_BINS += \
+#       $(if $(VBOX_WITH_VBOXBFE),VBoxBFE.so,)
 endif