Changeset 89653 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 13, 2021 9:59:57 PM (4 years ago)

Author:

vboxsync

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

145098

Message:

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

File:

• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (5 diffs)

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

@@ -118 +118 @@
         VBoxClient
 
-ifdef VBOX_WITH_VALIDATIONKIT
- # Validation Kit Audio Test (VKAT).
- VBOX_LNX_ADD_STRIP_VALKIT_BIN += vkat
-endif
-
 VBOX_LNX_ADD_STRIP_SBIN += \
         VBoxService \
@@ -156 +151 @@
 VBOX_LNX_ADD_INST_FILES := \
         $(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)) \
-        $(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_VALKIT_BIN)) \
         $(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_BIN)) \
         $(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)) \
@@ -167 +161 @@
 VBOX_LNX_ADD_DBG_FILES := \
         $(addprefix $(VBOX_LNX_ADD_DBG_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)) \
-        $(addprefix $(VBOX_LNX_ADD_DBG_BIN_DIR),$(VBOX_LNX_ADD_STRIP_VALKIT_BIN)) \
         $(addprefix $(VBOX_LNX_ADD_DBG_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)) \
         $(addprefix $(VBOX_LNX_ADD_DBG_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)) \
@@ -186 +179 @@
         $(QUIET)objcopy --only-keep-debug $< $@
 
-# pattern rules for copying the debug info from the VBOX_LNX_ADD_STRIP_VALKIT_* files to the installation directory
-$(addprefix $(VBOX_LNX_ADD_DBG_BIN_DIR),$(VBOX_LNX_ADD_STRIP_VALKIT_BIN)): \
-                $(VBOX_LNX_ADD_DBG_BIN_DIR)% : $(VBOX_PATH_VALIDATIONKIT_BIN)/% | $$(dir $$@)
-        $(call MSG_TOOL,copydbg,$<,$@)
-        $(QUIET)objcopy --only-keep-debug $< $@
-
 $(addprefix $(VBOX_LNX_ADD_DBG_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \
                 $(VBOX_LNX_ADD_DBG_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
@@ -210 +197 @@
 $(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)): \
                 $(VBOX_LNX_ADD_INST_BIN_DIR)% : $(PATH_STAGE_BIN)/additions/% \
-                $(VBOX_LNX_ADD_DBG_BIN_DIR)% \
-                | $$(dir $$@)
-        $(call MSG_INST_FILE,$<,$@)
-        $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
-        $(QUIET)objcopy --add-gnu-debuglink=$(subst $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_DBG_BIN_DIR),$@) $@
-
-# pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_VALKIT_BIN files to the installation directory
-$(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_VALKIT_BIN)): \
-                $(VBOX_LNX_ADD_INST_BIN_DIR)% : $(VBOX_PATH_VALIDATIONKIT_BIN)/% \
                 $(VBOX_LNX_ADD_DBG_BIN_DIR)% \
                 | $$(dir $$@)