Changeset 29899 in vbox for trunk/src/VBox

Timestamp:

May 31, 2010 12:40:46 PM (15 years ago)

Author:

vboxsync

Message:

Installer/solaris: more changes to get LICENSE into .tar.gz package

Location:

trunk/src/VBox/Installer/solaris

Files:

• Makefile.kmk (modified) (2 diffs)
• makepackage.sh (modified) (1 diff)

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

@@ -5 +5 @@
 
 #
-# Copyright (C) 2007-2008 Oracle Corporation
+# Copyright (C) 2007-2010 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -540 +540 @@
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_VBOXINST_DIR)/LICENSE)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_BASEINST_DIR)/vbox.copyright)
+        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_BASEINST_DIR)/LICENSE)
 ifdef VBOX_WITH_COMBINED_PACKAGE
  ifndef VBOX_OSE

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

@@ -142 +142 @@
 filelist_fixup prototype '$2 == "none"'                                                                '$5 = "root"; $6 = "bin"'
 
-# don't include autoresponse from the base folder into / of the package, it goes into .tar.gz
-# and another one already exists in /opt/VirtualBox
+# don't include autoresponse and LICENSE from the base folder into / of
+# the package, it goes into .tar.gz and another one already exists
+# in /opt/VirtualBox
 sed '/f none autoresponse/d' prototype > prototype2
+mv -f prototype2 prototype
+sed '/f none LICENSE/d' prototype > prototype2
 mv -f prototype2 prototype