Changeset 11963 in vbox

Timestamp:

Sep 2, 2008 8:24:25 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/installer: don't ship vnic scripts for VBoxNetFlt approach.

File:

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

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

@@ -140 +140 @@
         vboxdrv.sh \
         VBox.sh \
-        vnic_setup.sh \
-        vnic_term.sh \
+        $(if $(not $(VBOX_WITH_NETFLT))vnic_setup.sh,) \
+        $(if $(not $(VBOX_WITH_NETFLT))vnic_term.sh,) \
         virtualbox-webservice.xml \
         smf-vboxwebsrv.sh \
@@ -232 +232 @@
                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf \
                 $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf) \
-                $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh \
-                $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh \
+                $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh,) \
+                $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh,) \
                 $(addprefix $(PATH_BIN)/,$(filter-out $(SOLARIS_EXTRAS),$(SOLARIS_ARCH_FILES)))
         $(call MSG_L1,Installing binaries $(SOLARIS_INST_DIR))
@@ -369 +369 @@
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0644 $(PATH_CURRENT)/virtualbox-webservice.xml         $(SOLARIS_INST_DIR)/virtualbox-webservice.xml,)
         $(QUIET)$(if $(VBOX_WITH_WEBSERVICES),$(INSTALL) -m 0755 $(PATH_CURRENT)/smf-vboxwebsrv.sh                 $(SOLARIS_INST_DIR)/smf-vboxwebsrv.sh,)
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh            $(SOLARIS_INST_DIR)/vnic_setup.sh
-        $(QUIET)$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh            $(SOLARIS_INST_DIR)/vnic_term.sh
+        $(QUIET)$(if $(not $(VBOX_WITH_NETFLT))$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh            $(SOLARIS_INST_DIR)/vnic_setup.sh,)
+        $(QUIET)$(if $(not $(VBOX_WITH_NETFLT))$(INSTALL) -m 0755 $(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh            $(SOLARIS_INST_DIR)/vnic_term.sh,)
         $(QUIET)$(SED) \
                 -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,))/" \