Changeset 58345 in vbox for trunk/src/VBox

Timestamp:

Oct 20, 2015 4:19:04 PM (9 years ago)

Author:

vboxsync

Message:

Installer/linux (host): removed dead script.

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (3 diffs)
• installer-common.sh (deleted)
• testcase/Makefile.kmk (modified) (2 diffs)
• testcase/tstInstallInit.sh (deleted)
• testcase/tstInstaller.sh (deleted)
• testcase/tstInstallerLinux.sh (deleted)

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

@@ -364 +364 @@
                 $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
                 $(VBOX_LNX_INST_OUT_DIR)/install.sh \
-                $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh \
                 $$(linux-scripts_2_STAGE_TARGETS)
         $(call MSG_TOOL,makeself,,$@)
@@ -374 +373 @@
                 "VirtualBox for Linux installation" ./install.sh "\$$0 1> /dev/null"
 
-$(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_PATH_LNX_INST_SRC)/installer-common.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@)
+$(VBOX_LNX_INST_OUT_DIR)/install.sh: $(VBOX_PATH_LNX_INST_SRC)/install.sh $(VBOX_VERSION_STAMP) $(VBOX_SVN_REV_KMK).ts | $$(dir $$@)
         $(QUIET)$(SED) \
                 -e "s;_VERSION_;$(VBOX_VERSION_STRING);g" \
@@ -384 +383 @@
                 -e "s;_USERNAME_;$(USERNAME);g" \
                 -e "s;_PYTHON_;$(VBOX_WITH_PYTHON);g" \
-                -e '/#include installer-common.sh/ {' \
-                -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-common.sh" \
-                -e 'd' \
-                -e '}' \
                 --output $@ \
                 $<

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

@@ -19 +19 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-INSTALLS += tstInstallerLinux
-TESTING += tstInstallerLinux
-tstInstallerLinux_INST    = $(INST_TESTCASE)
-tstInstallerLinux_MODE    = a+rx,u+w
-tstInstallerLinux_SOURCES = $(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh
-tstInstallerLinux_CLEAN   = $(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh
-
-$$(tstInstallerLinux_0_OUTDIR)/tstInstallerLinux.sh: \
-                $(PATH_SUB_CURRENT)/tstInstallerLinux.sh \
-                $(PATH_SUB_CURRENT)/../installer-common.sh \
-                | $$(dir $$@)
-        $(QUIET)$(SED) \
-                -e '/#include installer-common.sh/ {' \
-                -e "r $(PATH_ROOT)/src/VBox/Installer/linux/installer-common.sh" \
-                -e 'd' \
-                -e '}' \
-                --output $@ \
-                $<
-        $(QUIET)$(CHMOD) a+rx,u+w $@
-
 INSTALLS += tstHeadlessXOrg
 TESTING += tstHeadlessXOrg
@@ -45 +25 @@
 tstHeadlessXOrg_SOURCES = tstHeadlessXOrg.sh
 
-INSTALLS += tstInstallInit
-TESTING += tstInstallInit
-tstInstallInit_INST    = $(INST_TESTCASE)
-tstInstallInit_MODE    = a+rx,u+w
-tstInstallInit_SOURCES = tstInstallInit.sh
-
 include $(FILE_KBUILD_SUB_FOOTER)