Changeset 8231 in vbox for trunk/src/VBox/Additions/solaris

Timestamp:

Apr 21, 2008 2:13:34 PM (17 years ago)

Author:

vboxsync

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

29958

Message:

Another build fix attempt for Solaris additions and the NFS problem.

File:

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

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

@@ -37 +37 @@
 VBOX_PATH_X11_ADDITION_INSTALLER := $(PATH_ROOT)/src/VBox/Additions/x11/installer
 SOLARISINSTDIR := $(PATH_TARGET)/install
+SOLARISTEMPDIR := $(PATH_TARGET)/tempinstall
 
 ifeq ($(BUILD_TYPE),debug)
@@ -80 +81 @@
         @# Clear out the existing package files if needed
         $(QUIET)rm -rf $(SOLARISINSTDIR)
+        $(QUIET)rm -rf $(SOLARISTEMPDIR)
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)
         $(QUIET)$(MKDIR) -p $(SOLARISINSTDIR)/etc
+        $(QUIET)$(MKDIR) -p $(SOLARISTEMPDIR)
         $(QUIET)$(SED) \
                 -e "s/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g" \
@@ -102 +105 @@
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/additions/vboxguest                                          $(SOLARISINSTDIR)/vboxguest
         @#$(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARISINSTDIR)/vboxguest,)
-        $(INSTALL) -m 0755 $(PATH_BIN)/additions/VBoxClient                                                 $(SOLARISINSTDIR)/VBoxClient
-        truss strip $(SOLARISINSTDIR)/VBoxClient
-        $(INSTALL) -m 0755 $(PATH_BIN)/additions/VBoxService                                                $(SOLARISINSTDIR)/VBoxService
-        truss strip $(SOLARISINSTDIR)/VBoxService
-        $(QUIET)$(if $(VBOX_DO_STRIP),/usr/sfw/bin/gstrip $(SOLARISINSTDIR)/VBoxService,)
+        $(INSTALL) -m 0755 $(PATH_BIN)/additions/VBoxClient                                                 $(SOLARISTEMPDIR)/VBoxClient
+        $(QUIET)strip $(SOLARISTEMPDIR)/VBoxClient
+        $(QUIET)$(MV) -f $(SOLARISTEMPDIR)/VBoxClient                                                       $(SOLARISINSTDIR)/VBoxClient
+        $(INSTALL) -m 0755 $(PATH_BIN)/additions/VBoxService                                                $(SOLARISTEMPDIR)/VBoxService
+        $(QUIET)strip $(SOLARISTEMPDIR)/VBoxService
+        $(QUIET)$(MV) -f $(SOLARISTEMPDIR)/VBoxService                                                      $(SOLARISINSTDIR)/VBoxService
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_13.so                                       $(SOLARISINSTDIR)/vboxvideo_drv_13.so
         $(QUIET)$(BIN_COPY) $(PATH_BIN)/additions/vboxvideo_drv_14.so                                       $(SOLARISINSTDIR)/vboxvideo_drv_14.so