VirtualBox

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


Ignore:
Timestamp:
Jun 11, 2021 10:58:34 AM (4 years ago)
Author:
vboxsync
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r89486 r89626  
    355355endif
    356356
     357ifdef VBOX_WITH_VALIDATIONKIT
     358 # Validation Kit Audio Test (VKAT).
     359 VBOX_LNX_STRIP_VALKIT_BIN += vkat
     360endif
     361
    357362# The sanitizer shared objects match the compiler we're using (HACK).
    358363ifeq ($(KBUILD_TYPE),asan)
     
    376381# All the bin files that goes into the archives.
    377382#
    378 VBOX_LNX_ARCH_FILES := $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_STRIP_OBJ) $(VBOX_LNX_NO_STRIP) src
     383VBOX_LNX_ARCH_FILES := $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN) $(VBOX_LNX_STRIP_OBJ) $(VBOX_LNX_NO_STRIP) src
    379384
    380385# Cleanup of the files we copy/symlink from bin.
    381386OTHER_CLEAN += $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(filter-out src,$(VBOX_LNX_ARCH_FILES)) src/vboxhost) \
    382387               $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\
    383                   $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
     388                  $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
    384389
    385390#
     
    472477$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_BIN)): \
    473478                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% \
     479                $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\
     480                    $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \
     481                | $$(dir $$@)
     482        $(call MSG_INST_FILE,$<,$@)
     483        $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@
     484        $(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),$@) $@)
     485
     486# pattern rule for stripping and copying the VBOX_LNX_STRIP_VALKIT_BIN files to archive/
     487$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_VALKIT_BIN)): \
     488                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(VBOX_PATH_VALIDATIONKIT_BIN)/% \
    474489                $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\
    475490                    $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \
     
    552567$(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \
    553568                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,\
    554                     $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
     569                    $(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN $(VBOX_LNX_STRIP_VALKIT_BIN)))
    555570        $(call MSG_L1,Packing $@)
    556571        $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
     
    558573        $(QUIET)tar --dereference --owner 0 --group 0 \
    559574                -cRhf $(patsubst %.bz2,%,$@) -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
    560                 $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
     575                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
    561576        $(QUIET)pbzip2 $(patsubst %.bz2,%,$@)
    562577else
    563578        $(QUIET)tar --dereference --owner 0 --group 0 \
    564579                -cjRhf $@ -C $(VBOX_LNX_INST_OUT_DIR)/archive-dbg \
    565                 $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN))
     580                $(addprefix $(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN) $(VBOX_LNX_DBG_BIN) $(VBOX_LNX_STRIP_VALKIT_BIN))
    566581endif
    567582
     
    572587        $(QUIET)objcopy --only-keep-debug $< $@
    573588
     589# pattern rule for copying the debug info from the VBOX_LNX_STRIP_VALKIT_BIN files into archive-dbg/$(VBOX_LNX_DBG_PATH)/
     590$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_VALKIT_BIN)): \
     591                $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(VBOX_PATH_VALIDATIONKIT_BIN)/% | $$(dir $$@)
     592        $(call MSG_TOOL,copydbg,$<,$@)
     593        $(QUIET)objcopy --only-keep-debug $< $@
     594
    574595# rules for creating directories in archive-dbg (the pattern rules depends on these).
    575596BLDDIRS += $(foreach d,\
     
    579600
    580601include $(FILE_KBUILD_SUB_FOOTER)
    581 
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette