Changeset 63875 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Sep 19, 2016 9:09:42 AM (9 years ago)

Author:

vboxsync

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

110737

Message:

bugref:3809: Linux installer maintenance: Additions installer small clean-ups.

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (1 diff)
• installer/install.sh.in (modified) (6 diffs)

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

@@ -394 +394 @@
         $(QUIET)$(SED) \
                 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
-                -e "s;_SVNREV_;$(VBOX_SVN_REV);g" \
                 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
                 -e "s;_USERNAME_;$(USERNAME);g" \
-                -e "s;_ARCH_;$(KBUILD_TARGET_ARCH);g" \
                 --output $@ \
                 $<

trunk/src/VBox/Additions/linux/installer/install.sh.in

@@ -29 +29 @@
 UNINSTALL="uninstall.sh"
 ROUTINES="routines.sh"
-ARCH="_ARCH_"
 INSTALLATION_VER="_VERSION_"
-INSTALLATION_REV="_SVNREV_"
 BUILD_TYPE="_BUILDTYPE_"
 USERNAME="_USERNAME_"
@@ -41 +39 @@
 CONFIG_FILES="filelist"
 SELF=$1
-LOGFILE="/var/log/$PACKAGE.log"
+LOGFILE="/var/log/vboxadd-install.log"
 
 . "./$ROUTINES"
@@ -404 +402 @@
 # Package version
 INSTALL_VER='$INSTALLATION_VER'
-INSTALL_REV='$INSTALLATION_REV'
 # Build type and user name for logging purposes
 BUILD_TYPE='$BUILD_TYPE'
@@ -436 +433 @@
 
 PATH=\$PATH:/bin:/sbin:/usr/sbin
-LOGFILE="/var/log/$PACKAGE-uninstall.log"
+LOGFILE="/var/log/vboxadd-uninstall.log"
 
 # Read routines.sh
@@ -461 +458 @@
 
 # Stop and clean up all services
-for i in "$INSTALLATION_DIR/init/vboxadd-x11" "$INSTALLATION_DIR/init/vboxadd-service" \
-    "$INSTALLATION_DIR/init/vboxadd"; do
+for i in "$INSTALLATION_DIR/init/vboxadd-service" "$INSTALLATION_DIR/init/vboxadd"; do
     if test -r "\$i"; then
         stop_init_script "\`basename "\$i"\`" 2>> "${LOGFILE}"
@@ -533 +529 @@
 test -n "$REMOVE_INSTALLATION_DIR" &&
   echo "$INSTALLATION_DIR/" >> "$CONFIG_DIR/$CONFIG_FILES"
-