Changeset 89626 in vbox

Timestamp:

Jun 11, 2021 10:58:34 AM (4 years ago)

Author:

vboxsync

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

145070

Message:

Audio/ValKit: Ship VKAT as part of the Linux host + guest installers. bugref:10008

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/linux/Makefile.kmk (modified) (5 diffs)
• src/VBox/Installer/linux/Makefile.kmk (modified) (7 diffs)

trunk/Config.kmk

@@ -161 +161 @@
 VBOX_PATH_DIST        = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST))
 VBOX_PATH_VALIDATIONKIT = $(patsubst %/,%,$(PATH_STAGE)/$(INST_VALIDATIONKIT))
+VBOX_PATH_VALIDATIONKIT_BIN := $(VBOX_PATH_VALIDATIONKIT)/$(KBUILD_TARGET)/$(KBUILD_TARGET_ARCH)
 VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
 VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))

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 \
@@ -151 +156 @@
 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)) \
@@ -161 +167 @@
 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)) \
@@ -179 +186 @@
         $(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 $$@)
@@ -197 +210 @@
 $(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 $$@)

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)
@@ -376 +381 @@
 # All the bin files that goes into the archives.
 #
-VBOX_LNX_ARCH_FILES := $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_STRIP_OBJ) $(VBOX_LNX_NO_STRIP) src
+VBOX_LNX_ARCH_FILES := $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_STRIP_VALKIT_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_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
 
 #
@@ -472 +477 @@
 $(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)/%) \
@@ -552 +567 @@
 $(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_BIN) $(VBOX_LNX_DBG_BIN $(VBOX_LNX_STRIP_VALKIT_BIN)))
         $(call MSG_L1,Packing $@)
         $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
@@ -558 +573 @@
         $(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))
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_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))
+                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
 endif
 
@@ -572 +587 @@
         $(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,\
@@ -579 +600 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
-