Changeset 89658 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Jun 13, 2021 10:58:50 PM (4 years ago)

Author:

vboxsync

Message:

Installer/linux/Makefile.kmk: Backed out vkat hack. bugref:10008

File:

• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (7 diffs)

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

@@ -355 +355 @@
 endif
 
-ifdef VBOX_WITH_VALIDATIONKIT
- # Validation Kit Audio Test (VKAT).
- VBOX_LNX_STRIP_VALKIT_BIN += vkat
-endif
-
 # The sanitizer shared objects match the compiler we're using (HACK).
 ifeq ($(KBUILD_TYPE),asan)
@@ -381 +376 @@
 # All the bin files that goes into the archives.
 #
-VBOX_LNX_ARCH_FILES := $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN) $(VBOX_LNX_STRIP_OBJ) $(VBOX_LNX_NO_STRIP) src
+VBOX_LNX_ARCH_FILES := $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_STRIP_OBJ) $(VBOX_LNX_NO_STRIP) src
 
 # Cleanup of the files we copy/symlink from bin.
 OTHER_CLEAN += $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(filter-out src,$(VBOX_LNX_ARCH_FILES)) src/vboxhost) \
                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\
-                  $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
+                  $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
 
 #
@@ -477 +472 @@
 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_BIN)): \
                 $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% \
-                $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\
-                    $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \
-                | $$(dir $$@)
-        $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)$(if $(VBOX_NO_LINUX_RUN_INSTALLER),,objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_INST_OUT_DIR)/archive,$(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH),$@) $@)
-
-# pattern rule for stripping and copying the VBOX_LNX_STRIP_VALKIT_BIN files to archive/
-$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_VALKIT_BIN)): \
-                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(VBOX_PATH_VALIDATIONKIT_BIN)/% \
                 $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\
                     $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \
@@ -567 +552 @@
 $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \
                 $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\
-                    $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN $(VBOX_LNX_STRIP_VALKIT_BIN)))
+                    $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
@@ -573 +558 @@
         $(QUIET)tar --dereference --owner 0 --group 0 \
                 -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
-                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
         $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
 else
         $(QUIET)tar --dereference --owner 0 --group 0 \
                 -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
-                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
 endif
 
@@ -587 +572 @@
         $(QUIET)objcopy --only-keep-debug $< $@
 
-# pattern rule for copying the debug info from the VBOX_LNX_STRIP_VALKIT_BIN files into archive-dbg/$(VBOX_LNX_DBG_PATH)/
-$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_VALKIT_BIN)): \
-                $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(VBOX_PATH_VALIDATIONKIT_BIN)/% | $$(dir $$@)
-        $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
-
 # rules for creating directories in archive-dbg (the pattern rules depends on these).
 BLDDIRS += $(foreach d,\
@@ -600 +579 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
+