Changeset 9052 in vbox for trunk

Timestamp:

May 22, 2008 10:57:45 AM (17 years ago)

Author:

vboxsync

Message:

Solaris installer: added PUEL to additions package. Fixed broken OSE packaging.

Location:

trunk/src/VBox

Files:

• Additions/solaris/Installer/makepackage.sh (modified) (1 diff)
• Additions/solaris/Makefile.kmk (modified) (3 diffs)
• Installer/solaris/makepackage.sh (modified) (1 diff)

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

@@ -46 +46 @@
 echo 'i preremove=./preremove.sh' >> prototype
 echo 'i space=./vboxguest.space' >> prototype
+if test -f "./vboxguest.copyright"; then
+    echo 'i copyright=./vboxguest.copyright' >> prototype
+fi
 echo 'e sed /etc/devlink.tab ? ? ?' >> prototype
-find . -print | $MY_GGREP -v -E 'prototype|makepackage.sh|vboxguest.pkginfo|postinstall.sh|preremove.sh|vboxguest.space' | pkgproto >> prototype
+find . -print | $MY_GGREP -v -E 'prototype|makepackage.sh|vboxguest.pkginfo|postinstall.sh|preremove.sh|vboxguest.space|vboxguest.copyright' | pkgproto >> prototype
 
 # don't grok for the sed class files

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

@@ -68 +68 @@
                 $(PATH_BIN)/additions/vboxguest \
                 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \
+                $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt) \
                 $(PATH_BIN)/additions/VBoxClient \
                 $(PATH_BIN)/additions/VBoxService \
@@ -98 +99 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxservice.xml                  $(SOLARISINSTDIR)/vboxservice.xml
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.space                  $(SOLARISINSTDIR)/vboxguest.space
+        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_ROOT)/doc/License.txt                           $(SOLARISINSTDIR)/vboxguest.copyright)
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop                   $(SOLARISINSTDIR)/vboxclient.desktop
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(SOLARISINSTDIR)/1099.vboxclient
@@ -107 +109 @@
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/additions/vboxguest                                          $(SOLARISINSTDIR)/vboxguest
         @#$(QUIET)$(if $(VBOX_DO_STRIP),strip $(SOLARISINSTDIR)/vboxguest,)
-        $(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxClient                                              $(SOLARISINSTDIR)/VBoxClient
-        $(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxService                                             $(SOLARISINSTDIR)/VBoxService
+        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/VBoxClient                                      $(SOLARISINSTDIR)/VBoxClient
+        $(QUIET)$(INSTALL) -s -m 0755 $(PATH_BIN)/additions/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

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

@@ -57 +57 @@
 echo 'i preremove=./preremove.sh' >> prototype
 echo 'i space=./vbox.space' >> prototype
-echo 'i copyright=./vbox.copyright' >> prototype
+if test -f "./vbox.copyright"; then
+    echo 'i copyright=./vbox.copyright' >> prototype
+fi
 echo 'e sed /etc/devlink.tab ? ? ?' >> prototype
 find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|preremove.sh|ReadMe.txt|vbox.space|vbox.copyright' | pkgproto >> prototype