Changeset 58400 in vbox

Timestamp:

Oct 24, 2015 5:04:50 PM (9 years ago)

Author:

vboxsync

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

103638

Message:

#8051: Installers: unify Linux host installers as far as possible: removed scripts and helper folders from the archive which forms the basis of the different installers instead of deleting them in individual installer scripts after unpacking the archive.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (6 diffs)
• debian/rules (modified) (1 diff)

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

@@ -68 +68 @@
         prerm-common.sh \
         routines.sh \
-        scripts/VBoxHeadlessXOrg.sh=>scripts/VBoxHeadlessXOrg.sh \
         VBoxSysInfo.sh \
         vboxautostart-service.sh \
@@ -180 +179 @@
                 ExtensionPacks/VNC/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/VBoxVNCMain.so,) \
         $(if $(VBOX_WITH_DTRACE),VBoxDTrace,)\
-        VBoxTunctl \
-        helpers/generate_service_file
+        VBoxTunctl
 
 # Do not remove relocation information of these binaries
@@ -218 +216 @@
         VBox.sh \
         vboxweb-service.sh \
-        VBox.png \
-        scripts
+        VBox.png
 
 ifdef VBOX_WITH_EXTPACK
@@ -397 +394 @@
         $(wildcard $(PATH_STAGE_BIN)/src/*/*) \
         $(wildcard $(PATH_STAGE_BIN)/src/*/*/*) \
-        $(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*) \
-        $(wildcard $(PATH_STAGE_BIN)/scripts/*)
-
+        $(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*)
 
 #
@@ -471 +466 @@
         archive \
         archive/components \
-        archive/helpers \
         archive/nls \
         $(if $(VBOX_WITH_QT4_SUN),archive/accessible,) \
@@ -525 +519 @@
         $(VBOX_LNX_DBG_PATH) \
         $(VBOX_LNX_DBG_PATH)/components \
-        $(VBOX_LNX_DBG_PATH)/helpers \
 ,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(d)/)
 

trunk/src/VBox/Installer/linux/debian/rules

@@ -280 +280 @@
             mv $(archdir)/$$i $(prefix)/usr/share/$(package); done
 endif
-        rm -r $(archdir)/helpers
-        rm -r $(archdir)/scripts
         mv $(archdir) $(prefix)/usr/lib/$(package)
         export VBOX_INSTALL_PATH=/usr/lib/$(package) && \