Changeset 19599 in vbox

Timestamp:

May 12, 2009 9:48:44 AM (16 years ago)

Author:

vboxsync

Message:

Solaris/VBoxNetAdp: added static hostname file for persistence.

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0 (added)
• Installer/solaris/Makefile.kmk (modified) (5 diffs)

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

@@ -53 +53 @@
 SOLARIS_USRSHR_PIXMAPS_DIR := $(SOLARIS_USR_DIR)/share/pixmaps
 SOLARIS_VBOXSMF_DIR        := $(SOLARIS_BASEINST_DIR)/var/svc/manifest/application/virtualbox
+SOLARIS_ETC_DIR            := $(SOLARIS_BASEINST_DIR)/etc
 
 SOLARIS_OUT_BIN_64     := $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin
@@ -106 +107 @@
         $(SOLARIS_BASEINST_DIR) \
         $(SOLARIS_VBOXINST_DIR) \
-        $(SOLARIS_DRIVERINST_DIR) \
-        $(SOLARIS_DRIVERINST_DIR_32) \
-        $(SOLARIS_DRIVERINST_DIR_64) \
-        $(SOLARIS_USR_DIR) \
-        $(SOLARIS_USRBIN_DIR) \
-        $(SOLARIS_USRSHR_APPS_DIR) \
-        $(SOLARIS_USRSHR_PIXMAPS_DIR) \
-        $(SOLARIS_VBOXSMF_DIR) \
         $(SOLARIS_VBI_DIR) \
         $(SOLARIS_DBG_DIR)
+
+BLDDIRS += $(foreach d,\
+        usr \
+        usr/bin \
+        platform \
+        platform/i86pc \
+        platform/i86pc/kernel \
+        platform/i86pc/kernel/drv \
+        platform/i86pc/kernel/drv/amd64 \
+,$(SOLARIS_BASEINST_DIR)/$(d))
+
 PACKING          += $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE)
 
@@ -244 +248 @@
         $(if $(VBOX_WITH_NETFLT),vboxflt.conf,) \
         $(if $(VBOX_WITH_NETADP),vboxnet.conf,) \
+        $(if $(VBOX_WITH_NETADP),hostname.vboxnet0,) \
         $(if $(VBOX_WITH_USB),vboxusbmon.conf,) \
         vboxdrv.sh \
@@ -430 +435 @@
                 $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf,) \
                 $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf,) \
+                $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0,) \
                 $(if $(VBOX_WITH_USB),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf,) \
                 $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh,) \
@@ -451 +457 @@
                 $(VBOX_PATH_SOL_INST_SRC)/vbox.pkginfo
         @# @todo BLDDIRS doesn't do "-p" subdir creation; so create for now
-        $(QUIET)$(MKDIR) -p $(SOLARIS_DRIVERINST_DIR)
-        $(QUIET)$(MKDIR) -p $(SOLARIS_DRIVERINST_DIR_64)
-        $(QUIET)$(MKDIR) -p $(SOLARIS_DRIVERINST_DIR_32)
+        $(QUIET)$(if $(VBOX_WITH_NETADP),$(MKDIR) -p $(SOLARIS_ETC_DIR),)
+        $(QUIET)$(MKDIR) -p $(SOLARIS_VBOXSMF_DIR)
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(MKDIR) -p $(SOLARIS_USRSHR_APPS_DIR),)
-        $(QUIET)$(MKDIR) -p $(SOLARIS_USRBIN_DIR)
         $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_PIXMAPS_DIR)
-        $(QUIET)$(MKDIR) -p $(SOLARIS_VBOXSMF_DIR)
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf                                     $(SOLARIS_DRIVERINST_DIR)/vboxdrv.conf
         $(QUIET)$(if $(VBOX_WITH_NETFLT),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf         $(SOLARIS_DRIVERINST_DIR)/vboxflt.conf,)
         $(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/vboxnet.conf         $(SOLARIS_DRIVERINST_DIR)/vboxnet.conf,)
+        $(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0    $(SOLARIS_ETC_DIR)/hostname.vboxnet0,)
         $(QUIET)$(if $(VBOX_WITH_USB),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/solaris/vboxusbmon.conf            $(SOLARIS_DRIVERINST_DIR)/vboxusbmon.conf,)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_VBOXINST_DIR)/LICENSE)