VirtualBox

Changeset 98408 in vbox for trunk/Makefile.kmk


Ignore:
Timestamp:
Feb 1, 2023 4:13:24 PM (22 months ago)
Author:
vboxsync
Message:

/Makefile.kmk: Automatic scm cleanups. bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r98103 r98408  
    3333#
    3434ifndef VBOX_ONLY_ROOT_MAKEFILE
    35  if  (defined(VBOX_WITH_DOCS) || defined(VBOX_WITH_MAIN)) \
    36   && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK)) \
    37   && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
     35 if   (defined(VBOX_WITH_DOCS) || defined(VBOX_WITH_MAIN)) \
     36   && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK)) \
     37   && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
    3838  include $(PATH_SUB_CURRENT)/doc/manual/Makefile.kmk
    3939 endif
    … …  
    7474
    7575
    76 if  !defined(VBOX_ONLY_ADDITIONS) \
    77  && !defined(VBOX_ONLY_DOCS) \
    78  && !defined(VBOX_ONLY_EXTPACKS) \
    79  && !defined(VBOX_ONLY_VALIDATIONKIT) # -> line 426b ;-)
     76if   !defined(VBOX_ONLY_ADDITIONS) \
     77  && !defined(VBOX_ONLY_DOCS) \
     78  && !defined(VBOX_ONLY_EXTPACKS) \
     79  && !defined(VBOX_ONLY_VALIDATIONKIT) # -> line 426b ;-)
    8080
    8181 if !defined(VBOX_OSE) && defined(VBOX_LICENSE_FILES)
    … …  
    8989  InstallLicenseFiles_SOURCES += \
    9090        $(VBOX_BRAND_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER).html \
    91         $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(VBOX_BRAND_$(f)_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER)-$(f).html)
     91        $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(VBOX_BRAND_$(f)_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER)-$(f).html)
    9292 endif
    9393
    9494
    95 #
    96 # Install external binaries (mostly redistributable parts of tools we use).
    97 #
    98 # To avoid dragging in unnecessary tools and sdks here, we don't use the .win
    99 # and .linux property suffixes.
    100 #
    101 INSTALLS += InstallExternalLibs
    102 
    103 InstallExternalLibs_INST = $(INST_BIN)
    104 
    105 # The SDL DLLs
    106 if1of ($(KBUILD_TARGET), win os2)
    107  ifdef VBOX_WITH_VBOXSDL
    108   include $(KBUILD_PATH)/sdks/LIBSDL.kmk
    109   InstallExternalLibs_SOURCES += \
    110         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(DLL_SDK_LIBSDL_SDL))
    111   ifdef VBOX_WITH_SECURELABEL
     95 #
     96 # Install external binaries (mostly redistributable parts of tools we use).
     97 #
     98 # To avoid dragging in unnecessary tools and sdks here, we don't use the .win
     99 # and .linux property suffixes.
     100 #
     101 INSTALLS += InstallExternalLibs
     102
     103 InstallExternalLibs_INST = $(INST_BIN)
     104
     105 # The SDL DLLs
     106 if1of ($(KBUILD_TARGET), win os2)
     107  ifdef VBOX_WITH_VBOXSDL
     108   include $(KBUILD_PATH)/sdks/LIBSDL.kmk
    112109   InstallExternalLibs_SOURCES += \
    113         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(DLL_SDK_LIBSDL_SDLTTF))
    114   endif
    115   ifeq ($(KBUILD_TARGET),os2)
    116    InstallExternalLibs_SOURCES += \
    117         $(DLL_SDK_LIBSDL_FSLIB)
    118   endif
    119  endif
    120 endif
    121 
    122 
    123 # The compiler runtime DLLs.
    124 ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
    125  ifndef TOOL_$(VBOX_VCC_TOOL)
    126   include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL).kmk
    127  endif
    128  ifndef TOOL_$(VBOX_VCC_TOOL_STEM)X86
    129   include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL_STEM)X86.kmk
    130  endif
    131  ifdef PATH_TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST
    132 InstallExternalLibs_SOURCES += \
    133         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT)/), \
    134                 $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)) \
    135         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
    136         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
    137   ifdef VBOX_WITH_32_ON_64_MAIN_API
    138 InstallExternalLibs_SOURCES += \
    139         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT)/), \
    140                 $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)) \
    141         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
    142   endif
    143   ifeq ($(VBOX_VCC_CRT_TYPE),d)
    144 InstallExternalLibs_SOURCES += \
    145         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_DEBUG_CRT)/), \
    146                 $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)))) \
    147         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
    148         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
    149    ifdef VBOX_WITH_32_ON_64_MAIN_API
    150 InstallExternalLibs_SOURCES += \
    151         $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_DEBUG_CRT)/), \
    152                 $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)))) \
    153         ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
     110        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(DLL_SDK_LIBSDL_SDL))
     111   ifdef VBOX_WITH_SECURELABEL
     112    InstallExternalLibs_SOURCES += \
     113        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(DLL_SDK_LIBSDL_SDLTTF))
    154114   endif
    155   endif
    156   ifeq ($(KBUILD_TYPE),asan)
    157    ifeq ($(KBUILD_TARGET_ARCH),amd64)
    158 InstallExternalLibs_SOURCES += \
    159         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dynamic-x86_64.dll) \
    160         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dynamic-x86_64.dll)=>testcase/clang_rt.asan_dynamic-x86_64.dll
    161     ifeq ($(VBOX_VCC_CRT_TYPE),d)
    162 InstallExternalLibs_SOURCES += \
    163         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dbg_dynamic-x86_64.dll) \
    164         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dbg_dynamic-x86_64.dll)=>testcase/clang_rt.asan_dbg_dynamic-x86_64.dll
    165     endif
    166    endif
    167    ifeq ($(KBUILD_TARGET_ARCH),x86)
    168 InstallExternalLibs_SOURCES += \
    169         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll) \
    170         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll)=>testcase/clang_rt.asan_dynamic-i386.dll
    171     ifeq ($(VBOX_VCC_CRT_TYPE),d)
    172 InstallExternalLibs_SOURCES += \
    173         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll) \
    174         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll)=>testcase/clang_rt.asan_dbg_dynamic-i386.dll
    175     endif
    176    endif
    177    ifdef VBOX_WITH_32_ON_64_MAIN_API
    178 InstallExternalLibs_SOURCES += $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll,x86)=>x86/clang_rt.asan_dynamic-i386.dll
    179     ifeq ($(VBOX_VCC_CRT_TYPE),d)
    180 InstallExternalLibs_SOURCES += $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll,x86)=>x86/clang_rt.asan_dbg_dynamic-i386.dll
    181     endif
    182    endif
    183   endif
    184  else
    185 VBOX_VCC_REDIR_BASE             := Microsoft.VC$(substr $(VBOX_VCC_TOOL),4,3)
    186 VBOX_PATH_VCC_REDIST             = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
    187 VBOX_PATH_VCC_REDIST_CRT         = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/$(VBOX_VCC_REDIR_BASE).CRT
    188 VBOX_PATH_VCC_REDIST_CRT_DBG     = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/$(VBOX_VCC_REDIR_BASE).DebugCRT
    189 VBOX_PATH_VCC_REDIST_CRT_X86     = $(VBOX_PATH_VCC_REDIST)/x86/$(VBOX_VCC_REDIR_BASE).CRT
    190 VBOX_PATH_VCC_REDIST_CRT_DBG_X86 = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/x86/$(VBOX_VCC_REDIR_BASE).DebugCRT
    191 
    192 InstallExternalLibs_SOURCES += \
    193         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll) \
    194         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll) \
    195         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll)=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
    196         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll)=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
    197   ifdef VBOX_WITH_32_ON_64_MAIN_API
    198 InstallExternalLibs_SOURCES += \
    199         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll,x86_)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
    200         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll,x86_)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
    201   endif
    202   ifeq ($(VBOX_VCC_CRT_TYPE),d)
    203 InstallExternalLibs_SOURCES += \
    204         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll) \
    205         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll) \
    206         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll)=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll \
    207         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll)=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll
    208    ifdef VBOX_WITH_32_ON_64_MAIN_API
    209 InstallExternalLibs_SOURCES += \
    210         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll,x86_)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll \
    211         $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll,x86_)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll
     115   ifeq ($(KBUILD_TARGET),os2)
     116    InstallExternalLibs_SOURCES += \
     117        $(DLL_SDK_LIBSDL_FSLIB)
    212118   endif
    213119  endif
    214120 endif
    215 endif
    216 
    217 #
    218 # Install our Qt DLLs / Shared Objects / Frameworks.
    219 # Note: The installer fixes the darwin .dylibs when hardening is enabled.
    220 # Note: Contents/Info.plist is where it's in 4.7.x, not sure if the location is kosher... According to
    221 #       https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
    222 #       the Info.plist file goes into Resources.
    223 #
    224 ifeq ($(KBUILD_TARGET),darwin)
    225  ifdef VBOX_WITH_QT6
    226   include $(KBUILD_PATH)/units/qt6.kmk
    227   VBOX_QT_FWRK_VER = A
    228   VBOX_QT_PATH     = $(PATH_SDK_QT6)
    229   VBOX_QT_PATH_LIB = $(PATH_SDK_QT6_LIB)
    230  else
    231   include $(KBUILD_PATH)/units/qt5.kmk
    232   VBOX_QT_FWRK_VER = 5
    233   VBOX_QT_PATH     = $(PATH_SDK_QT5)
    234   VBOX_QT_PATH_LIB = $(PATH_SDK_QT5_LIB)
    235  endif
    236  ifdef VBOX_WITH_QTGUI
    237   INSTALLS += qt5-bin
    238  endif
    239  qt5-bin_INST = $(INST_VIRTUALBOX)Contents/
    240  qt5-bin_EXEC_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
    241         $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod))
    242  qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
    243         $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist)
    244  ifdef VBOX_WITH_QT_DSYMS
    245   qt5-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
    246         $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Info.plist=>Frameworks/$(qtmod).framework.dSYM/Contents/Info.plist \
    247         $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)=>Frameworks/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod))
    248  endif
    249  qt5-bin_EXEC_SOURCES += \
    250         $(VBOX_QT_PATH)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \
    251         $(VBOX_QT_PATH)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \
    252         $(VBOX_QT_PATH)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL) \
    253         $(VBOX_QT_PATH)/plugins/sqldrivers/libqsqlite$(SUFF_DLL)=>plugins/sqldrivers/libqsqlite$(SUFF_DLL) \
    254         $(VBOX_QT_PATH)/plugins/styles/libqmacstyle$(SUFF_DLL)=>plugins/styles/libqmacstyle$(SUFF_DLL)
    255  ifdef VBOX_WITH_QT_DSYMS
    256   qt5-bin_SOURCES += $(foreach qtplat, libqcocoa libqminimal libqoffscreen, \
    257         $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
    258         $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))
    259   qt5-bin_SOURCES += $(foreach qtsqldrv, libqsqlite, \
    260         $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
    261         $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL))
    262   qt5-bin_SOURCES += $(foreach qtstyl, libqmacstyle, \
    263         $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
    264         $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))
    265  endif
    266  qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    267         Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_FWRK_VER) \
    268         Frameworks/$(qtmod).framework/$(qtmod)=>Versions/$(VBOX_QT_FWRK_VER)/$(qtmod) \
    269         Frameworks/$(qtmod).framework/Resources=>Versions/$(VBOX_QT_FWRK_VER)/Resources)
    270  qt5-bin_INSTALLER = $(INSTALL) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) $(if $(mode),-m $(mode)) $(4) -- \
    271                         "$(1)" "$(2)" $(if-expr "$(source_type_prefix)" == "EXEC_" \
    272                         ,$(NLTAB)install_name_tool \
    273                         $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/$(VBOX_QT_FWRK_VER)/$(notdir $(2))",) \
    274                         $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
    275                                 $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(VBOX_QT_PATH)/, \
    276                                 -change "$(prefix)$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" \
    277                                         "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" ) ) \
    278                         "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES.
    279 else # win x11
    280  if1of ($(KBUILD_TARGET), linux solaris)
    281   if !defined(VBOX_ONLY_BUILD) && defined(VBOX_WITH_QTGUI)
    282    ifneq ($(VBOX_GCC_VERSION_CXX),)
    283     if $(VBOX_GCC_VERSION_CXX) < 40400
    284      $(error gcc >= 4.4 required when compiling against Qt5!)
     121
     122
     123 # The compiler runtime DLLs.
     124 ifeq ($(KBUILD_TARGET).$(VBOX_WITHOUT_COMPILER_REDIST),win.)
     125  ifndef TOOL_$(VBOX_VCC_TOOL)
     126   include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL).kmk
     127  endif
     128  ifndef TOOL_$(VBOX_VCC_TOOL_STEM)X86
     129   include $(KBUILD_PATH)/tools/$(VBOX_VCC_TOOL_STEM)X86.kmk
     130  endif
     131  ifdef PATH_TOOL_$(VBOX_VCC_TOOL_STEM)_REDIST
     132   InstallExternalLibs_SOURCES += \
     133        $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT)/), \
     134        $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)) \
     135        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
     136        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
     137   ifdef VBOX_WITH_32_ON_64_MAIN_API
     138    InstallExternalLibs_SOURCES += \
     139        $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT)/), \
     140        $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)) \
     141        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
     142   endif
     143   ifeq ($(VBOX_VCC_CRT_TYPE),d)
     144    InstallExternalLibs_SOURCES += \
     145        $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL)_REDIST_DEBUG_CRT)/), \
     146        $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL)_REDIST_CPP_DLLS)))) \
     147        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll)) \
     148        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll))=>testcase/$(qnotdir ,$(redistdll)))
     149    ifdef VBOX_WITH_32_ON_64_MAIN_API
     150     InstallExternalLibs_SOURCES += \
     151        $(foreachfile redistdll, $(qaddprefix ,$(requote unq,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_DEBUG_CRT)/), \
     152        $(addsuffix d.dll,$(basename $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CRT_DLLS) $(TOOL_$(VBOX_VCC_TOOL_STEM)X86_REDIST_CPP_DLLS)))) \
     153        ,$(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(redistdll),x86)=>x86/$(qnotdir ,$(redistdll)))
     154    endif
     155   endif
     156   ifeq ($(KBUILD_TYPE),asan)
     157    ifeq ($(KBUILD_TARGET_ARCH),amd64)
     158     InstallExternalLibs_SOURCES += \
     159        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dynamic-x86_64.dll) \
     160        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dynamic-x86_64.dll)=>testcase/clang_rt.asan_dynamic-x86_64.dll
     161     ifeq ($(VBOX_VCC_CRT_TYPE),d)
     162      InstallExternalLibs_SOURCES += \
     163        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dbg_dynamic-x86_64.dll) \
     164        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_BIN)/clang_rt.asan_dbg_dynamic-x86_64.dll)=>testcase/clang_rt.asan_dbg_dynamic-x86_64.dll
     165     endif
     166    endif
     167    ifeq ($(KBUILD_TARGET_ARCH),x86)
     168     InstallExternalLibs_SOURCES += \
     169        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll) \
     170        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll)=>testcase/clang_rt.asan_dynamic-i386.dll
     171     ifeq ($(VBOX_VCC_CRT_TYPE),d)
     172      InstallExternalLibs_SOURCES += \
     173        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll) \
     174        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll)=>testcase/clang_rt.asan_dbg_dynamic-i386.dll
     175     endif
     176    endif
     177    ifdef VBOX_WITH_32_ON_64_MAIN_API
     178     InstallExternalLibs_SOURCES += $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dynamic-i386.dll,x86)=>x86/clang_rt.asan_dynamic-i386.dll
     179     ifeq ($(VBOX_VCC_CRT_TYPE),d)
     180      InstallExternalLibs_SOURCES += $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_BIN)/clang_rt.asan_dbg_dynamic-i386.dll,x86)=>x86/clang_rt.asan_dbg_dynamic-i386.dll
     181     endif
     182    endif
     183   endif
     184  else
     185   VBOX_VCC_REDIR_BASE          := Microsoft.VC$(substr $(VBOX_VCC_TOOL),4,3)
     186   VBOX_PATH_VCC_REDIST          = $(PATH_TOOL_$(VBOX_VCC_TOOL))/redist/
     187   VBOX_PATH_VCC_REDIST_CRT      = $(VBOX_PATH_VCC_REDIST)/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/$(VBOX_VCC_REDIR_BASE).CRT
     188   VBOX_PATH_VCC_REDIST_CRT_DBG  = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/$(subst amd64,x64,$(KBUILD_TARGET_ARCH))/$(VBOX_VCC_REDIR_BASE).DebugCRT
     189   VBOX_PATH_VCC_REDIST_CRT_X86  = $(VBOX_PATH_VCC_REDIST)/x86/$(VBOX_VCC_REDIR_BASE).CRT
     190   VBOX_PATH_VCC_REDIST_CRT_DBG_X86 = $(VBOX_PATH_VCC_REDIST)/Debug_NonRedist/x86/$(VBOX_VCC_REDIR_BASE).DebugCRT
     191
     192   InstallExternalLibs_SOURCES += \
     193        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll) \
     194        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll) \
     195        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll)=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     196        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll)=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     197   ifdef VBOX_WITH_32_ON_64_MAIN_API
     198    InstallExternalLibs_SOURCES += \
     199        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll,x86_)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4).dll \
     200        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll,x86_)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4).dll
     201   endif
     202   ifeq ($(VBOX_VCC_CRT_TYPE),d)
     203    InstallExternalLibs_SOURCES += \
     204        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll) \
     205        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll) \
     206        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll)=>testcase/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll \
     207        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG)/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll)=>testcase/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll
     208    ifdef VBOX_WITH_32_ON_64_MAIN_API
     209     InstallExternalLibs_SOURCES += \
     210        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcr$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll,x86_)=>x86/msvcr$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll \
     211        $(call VBOX_RE_SIGN_DLL_FN,InstallExternalLibs,$(VBOX_PATH_VCC_REDIST_CRT_DBG_X86)/msvcp$(substr $(VBOX_VCC_TOOL_STEM)d,4).dll,x86_)=>x86/msvcp$(substr $(VBOX_VCC_TOOL_STEM),4)d.dll
    285212    endif
    286213   endif
    287214  endif
    288215 endif
    289  if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
    290   include $(KBUILD_PATH)/units/qt5.kmk
    291   ifeq ($(KBUILD_TARGET),win)
    292    ifdef VBOX_WITH_QTGUI
    293     INSTALLS += qt5-bin
     216
     217 #
     218 # Install our Qt DLLs / Shared Objects / Frameworks.
     219 # Note: The installer fixes the darwin .dylibs when hardening is enabled.
     220 # Note: Contents/Info.plist is where it's in 4.7.x, not sure if the location is kosher... According to
     221 #       https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html
     222 #       the Info.plist file goes into Resources.
     223 #
     224 ifeq ($(KBUILD_TARGET),darwin)
     225  ifdef VBOX_WITH_QT6
     226   include $(KBUILD_PATH)/units/qt6.kmk
     227   VBOX_QT_FWRK_VER = A
     228   VBOX_QT_PATH    = $(PATH_SDK_QT6)
     229   VBOX_QT_PATH_LIB = $(PATH_SDK_QT6_LIB)
     230  else
     231   include $(KBUILD_PATH)/units/qt5.kmk
     232   VBOX_QT_FWRK_VER = 5
     233   VBOX_QT_PATH    = $(PATH_SDK_QT5)
     234   VBOX_QT_PATH_LIB = $(PATH_SDK_QT5_LIB)
     235  endif
     236  ifdef VBOX_WITH_QTGUI
     237   INSTALLS += qt5-bin
     238  endif
     239  qt5-bin_INST = $(INST_VIRTUALBOX)Contents/
     240  qt5-bin_EXEC_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
     241        $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod))
     242  qt5-bin_SOURCES = $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
     243        $(VBOX_QT_PATH_LIB)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist=>Frameworks/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/Resources/Info.plist)
     244  ifdef VBOX_WITH_QT_DSYMS
     245   qt5-bin_SOURCES += $(foreach qtmod,$(VBOX_QT_MOD_NAMES), \
     246        $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Info.plist=>Frameworks/$(qtmod).framework.dSYM/Contents/Info.plist \
     247        $(VBOX_QT_PATH_LIB)/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod)=>Frameworks/$(qtmod).framework.dSYM/Contents/Resources/DWARF/$(qtmod))
     248  endif
     249  qt5-bin_EXEC_SOURCES += \
     250        $(VBOX_QT_PATH)/plugins/platforms/libqcocoa$(SUFF_DLL)=>plugins/platforms/libqcocoa$(SUFF_DLL) \
     251        $(VBOX_QT_PATH)/plugins/platforms/libqminimal$(SUFF_DLL)=>plugins/platforms/libqminimal$(SUFF_DLL) \
     252        $(VBOX_QT_PATH)/plugins/platforms/libqoffscreen$(SUFF_DLL)=>plugins/platforms/libqoffscreen$(SUFF_DLL) \
     253        $(VBOX_QT_PATH)/plugins/sqldrivers/libqsqlite$(SUFF_DLL)=>plugins/sqldrivers/libqsqlite$(SUFF_DLL) \
     254        $(VBOX_QT_PATH)/plugins/styles/libqmacstyle$(SUFF_DLL)=>plugins/styles/libqmacstyle$(SUFF_DLL)
     255  ifdef VBOX_WITH_QT_DSYMS
     256   qt5-bin_SOURCES += $(foreach qtplat, libqcocoa libqminimal libqoffscreen, \
     257        $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Info.plist \
     258        $(VBOX_QT_PATH)/plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL)=>plugins/platforms/$(qtplat)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtplat)$(SUFF_DLL))
     259   qt5-bin_SOURCES += $(foreach qtsqldrv, libqsqlite, \
     260        $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Info.plist \
     261        $(VBOX_QT_PATH)/plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL)=>plugins/sqldrivers/$(qtsqldrv)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtsqldrv)$(SUFF_DLL))
     262   qt5-bin_SOURCES += $(foreach qtstyl, libqmacstyle, \
     263        $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Info.plist \
     264        $(VBOX_QT_PATH)/plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL)=>plugins/styles/$(qtstyl)$(SUFF_DLL).dSYM/Contents/Resources/DWARF/$(qtstyl)$(SUFF_DLL))
     265  endif
     266  qt5-bin_SYMLINKS = $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
     267        Frameworks/$(qtmod).framework/Versions/Current=>$(VBOX_QT_FWRK_VER) \
     268        Frameworks/$(qtmod).framework/$(qtmod)=>Versions/$(VBOX_QT_FWRK_VER)/$(qtmod) \
     269        Frameworks/$(qtmod).framework/Resources=>Versions/$(VBOX_QT_FWRK_VER)/Resources)
     270  qt5-bin_INSTALLER = $(INSTALL) $(if $(uid),-o $(uid)) $(if $(gid),-g $(gid)) $(if $(mode),-m $(mode)) $(4) -- \
     271        "$(1)" "$(2)" $(if-expr "$(source_type_prefix)" == "EXEC_" \
     272        ,$(NLTAB)install_name_tool \
     273        $(if-expr "$(suffix $2)" == "", -id "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Framework,@rpath)/$(notdir $(2)).framework/Version/$(VBOX_QT_FWRK_VER)/$(notdir $(2))",) \
     274        $(foreach qtmod, $(VBOX_QT_MOD_NAMES), \
     275        $(foreach prefix, @executable_path/../Frameworks/ $(VBOX_PATH_QT)/Frameworks/ $(VBOX_QT_PATH)/, \
     276        -change "$(prefix)$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" \
     277        "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,@rpath)/$(qtmod).framework/Versions/$(VBOX_QT_FWRK_VER)/$(qtmod)" ) ) \
     278        "$(2)",)  # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES.
     279 else # win x11
     280  if1of ($(KBUILD_TARGET), linux solaris)
     281   if !defined(VBOX_ONLY_BUILD) && defined(VBOX_WITH_QTGUI)
     282    ifneq ($(VBOX_GCC_VERSION_CXX),)
     283     if $(VBOX_GCC_VERSION_CXX) < 40400
     284      $(error gcc >= 4.4 required when compiling against Qt5!)
     285     endif
     286    endif
    294287   endif
    295    qt5-bin_MODE = 755
    296    qt5-bin_INST = $(INST_BIN)
    297    qt5-bin_SOURCES = \
    298     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/bin/$(qtmod)$(SUFF_DLL)))
    299    qt5-bin_SOURCES += \
    300     $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qwindows$(SUFF_DLL))=>platforms/qwindows$(SUFF_DLL) \
    301     $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qminimal$(SUFF_DLL))=>platforms/qminimal$(SUFF_DLL) \
    302     $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qoffscreen$(SUFF_DLL))=>platforms/qoffscreen$(SUFF_DLL) \
    303     $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/sqldrivers/qsqlite$(SUFF_DLL))=>sqldrivers/qsqlite$(SUFF_DLL) \
    304     $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/styles/qwindowsvistastyle$(SUFF_DLL))=>styles/qwindowsvistastyle$(SUFF_DLL)
    305    ifdef VBOX_WITH_QT_PDBS
     288  endif
     289  if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
     290   include $(KBUILD_PATH)/units/qt5.kmk
     291   ifeq ($(KBUILD_TARGET),win)
     292    ifdef VBOX_WITH_QTGUI
     293     INSTALLS += qt5-bin
     294    endif
     295    qt5-bin_MODE = 755
     296    qt5-bin_INST = $(INST_BIN)
     297    qt5-bin_SOURCES = \
     298        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/bin/$(qtmod)$(SUFF_DLL)))
    306299    qt5-bin_SOURCES += \
    307      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT5)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
    308    endif # VBOX_WITH_QT_PDBS
    309   else # x11
    310    ifdef VBOX_WITH_QTGUI
    311     INSTALLS += qt5-bin
    312    endif
    313    qt5-bin_MODE = 755
    314    qt5-bin_INST = $(INST_BIN)
    315    ifdef VBOX_WITH_HARDENING
    316     # The wildcards are necessary to install the libs instead of the symlinks
    317     qt5-bin_SOURCES = \
    318      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*[0-9])=>lib$(qtmod).so.5) \
    319      $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib))
    320    else # !VBOX_WITH_HARDENING
    321     # For non-hardened builds we need to remove the RUNPATH. This stuff is
    322     # ugly but we need to prevent kBuild from hard-linking otherwise we
    323     # (indirectly) change the binaries in tools
    324     ifneq ($(KBUILD_TARGET),solaris)
    325      QT5_VERSION = 5.15.2
    326     else
    327      QT5_VERSION = 5.15.2
     300        $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qwindows$(SUFF_DLL))=>platforms/qwindows$(SUFF_DLL) \
     301        $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qminimal$(SUFF_DLL))=>platforms/qminimal$(SUFF_DLL) \
     302        $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/platforms/qoffscreen$(SUFF_DLL))=>platforms/qoffscreen$(SUFF_DLL) \
     303        $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/sqldrivers/qsqlite$(SUFF_DLL))=>sqldrivers/qsqlite$(SUFF_DLL) \
     304        $(call VBOX_RE_SIGN_DLL_FN,qt5-bin,$(PATH_SDK_QT5)/plugins/styles/qwindowsvistastyle$(SUFF_DLL))=>styles/qwindowsvistastyle$(SUFF_DLL)
     305    ifdef VBOX_WITH_QT_PDBS
     306     qt5-bin_SOURCES += \
     307        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(PATH_SDK_QT5)/qt*/$(VBOX_PATH_QT_LIB)/$(qtmod).pdb))
     308    endif # VBOX_WITH_QT_PDBS
     309   else # x11
     310    ifdef VBOX_WITH_QTGUI
     311     INSTALLS += qt5-bin
    328312    endif
    329     qt5-bin_SOURCES = \
    330      $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)=>lib$(qtmod).so.5) \
    331      $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib))
    332 
    333 $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)): \
    334         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
     313    qt5-bin_MODE = 755
     314    qt5-bin_INST = $(INST_BIN)
     315    ifdef VBOX_WITH_HARDENING
     316     # The wildcards are necessary to install the libs instead of the symlinks
     317     qt5-bin_SOURCES = \
     318        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(wildcard $(VBOX_PATH_QT_LIB)/lib$(qtmod).so.*.*.*[0-9])=>lib$(qtmod).so.5) \
     319        $(foreach lib,$(VBOX_QT_PLUGINS),$(VBOX_PATH_QT)/$(lib)=>$(lib))
     320    else # !VBOX_WITH_HARDENING
     321     # For non-hardened builds we need to remove the RUNPATH. This stuff is
     322     # ugly but we need to prevent kBuild from hard-linking otherwise we
     323     # (indirectly) change the binaries in tools
     324     ifneq ($(KBUILD_TARGET),solaris)
     325      QT5_VERSION = 5.15.2
     326     else
     327      QT5_VERSION = 5.15.2
     328     endif
     329     qt5-bin_SOURCES = \
     330        $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)=>lib$(qtmod).so.5) \
     331        $(foreach lib,$(VBOX_QT_PLUGINS),$(qt5-bin_0_OUTDIR)/$(lib)=>$(lib))
     332
     333     $(foreach qtmod,$(VBOX_QT_MOD_NAMES),$$(qt5-bin_0_OUTDIR)/lib$(qtmod).so.$(QT5_VERSION)): \
     334                $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT_LIB)/% | $$(qt5-bin_0_OUTDIR)/
    335335        $(call MSG_INST_FILE,$^,$@)
    336336        $(QUIET)$(CP) $^ $@
    337337        $(QUIET)chrpath --replace "\$$ORIGIN" $@
    338338
    339      ifn1of ($(KBUILD_TARGET),solaris linux)
    340 $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    341         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
     339     ifn1of ($(KBUILD_TARGET), solaris linux)
     340      $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
     341                $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
    342342        $(call MSG_INST_FILE,$^,$@)
    343343        $(QUIET)$(MKDIR) -p $(@D)
    … …  
    348348     # @todo For solaris and some linuxes dlopen fails to navigate executable rpath to dependent libraries,
    349349     #       so add explicit rpath for libqxcb.so, find better solution later.
    350      if1of ($(KBUILD_TARGET),solaris linux)
    351 $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
    352         $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
     350     if1of ($(KBUILD_TARGET), solaris linux)
     351      $(foreach lib,$(VBOX_QT_PLUGINS),$$(qt5-bin_0_OUTDIR)/$(lib)): \
     352                $$(qt5-bin_0_OUTDIR)/% : $(VBOX_PATH_QT)/% | $$(qt5-bin_0_OUTDIR)/
    353353        $(call MSG_INST_FILE,$^,$@)
    354354        $(QUIET)$(MKDIR) -p $(@D)
    … …  
    357357     endif # solaris linux
    358358
    359    endif # !VBOX_WITH_HARDENING
    360   endif # x11
    361  endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD
    362 endif # win x11
    363 
    364 
    365 #
    366 # Install additions iso from the build server if configured to do so.
    367 #
    368 # Note! For building the combined package, just get the additions .ISO
    369 #       once for amd64 to prevent version inconsistences. In all other
    370 #       cases we get the .ISO per target architecture.
    371 #
    372 if  defined(VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER) \
    373  && (   !defined(VBOX_WITH_COMBINED_PACKAGE) \
    374      || "$(KBUILD_TARGET_ARCH)" == "amd64" )
    375  INSTALLS += buildserver-additions
    376  buildserver-additions_INST = $(INST_ADDITIONS_ISO)
    377  buildserver-additions_MODE = 0644
    378  buildserver-additions_SOURCES = $(PATH_TARGET)/VBoxGuestAdditions.iso
    379  buildserver-additions_CLEANS = \
    380         $(buildserver-additions_0_OUTDIR)/unpacked.ts \
    381         $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip \
    382         $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp \
    383         $(PATH_TARGET)/VBoxGuestAdditions.iso
    384 
    385  $$(buildserver-additions_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VBoxGuestAdditions.iso: \
    386                 $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip
     359    endif # !VBOX_WITH_HARDENING
     360   endif # x11
     361  endif # VBOX_WITH_ORACLE_QT || VBOX_WITH_QT_PAYLOAD
     362 endif # win x11
     363
     364
     365 #
     366 # Install additions iso from the build server if configured to do so.
     367 #
     368 # Note! For building the combined package, just get the additions .ISO
     369 #       once for amd64 to prevent version inconsistences. In all other
     370 #       cases we get the .ISO per target architecture.
     371 #
     372 if   defined(VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER) \
     373   && (   !defined(VBOX_WITH_COMBINED_PACKAGE) \
     374   || "$(KBUILD_TARGET_ARCH)" == "amd64" )
     375  INSTALLS += buildserver-additions
     376  buildserver-additions_INST = $(INST_ADDITIONS_ISO)
     377  buildserver-additions_MODE = 0644
     378  buildserver-additions_SOURCES = $(PATH_TARGET)/VBoxGuestAdditions.iso
     379  buildserver-additions_CLEANS = \
     380        $(buildserver-additions_0_OUTDIR)/unpacked.ts \
     381        $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip \
     382        $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp \
     383        $(PATH_TARGET)/VBoxGuestAdditions.iso
     384
     385  $$(buildserver-additions_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VBoxGuestAdditions.iso: \
     386                $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip
    387387        $(call MSG_L1,Unpacking additions archive)
    388388        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET)
    … …  
    390390        $(APPEND) -t $@ "done"
    391391
    392  $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/additions.sh | $$(dir $$@)
     392  $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/additions.sh | $$(dir $$@)
    393393        $(RM) -f -- "$@" "[email protected]"
    394394        $(SHELL) $(KBUILD_DEVTOOLS)/bin/additions.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
    395395        $(MV) -f -- "[email protected]" "$@"
    396396
    397 endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER unless win.x86+combined
    398 
    399 
    400 #
    401 # Install documentation files (at the moment the .chm) from the build server.
    402 #
    403 ifdef VBOX_WITH_DOCS_FROM_BUILD_SERVER
    404 ## @todo r=bird: Too much mess now for $(PATH_TARGET); move to doc/manual/.
    405 INSTALLS += buildserver-docs
    406 buildserver-docs_INST = $(INST_BIN)
    407 buildserver-docs_MODE = 0644
    408 buildserver-docs_SOURCES = \
    409         $(addprefix $(PATH_TARGET)/, \
    410                 $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
    411                 $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
    412                 UserManual.pdf \
    413                 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
    414                         $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
    415                         $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
    416                         UserManual_$(f).pdf))
    417 buildserver-docs_CLEANS = \
    418         $(buildserver-docs_0_OUTDIR)/unpacked.ts \
    419         $(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip \
    420         $(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip.tmp \
    421         $(addprefix $(PATH_TARGET)/, \
    422                 VirtualBox.chm UserManual.qch UserManual.qhc UserManual.pdf \
    423                 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
    424                         VirtualBox_$(f).chm \
    425                         UserManual_$(f).qch UserManual_$(f).qhc \
    426                         UserManual_$(f).pdf))
    427 
    428 $$(buildserver-docs_0_OUTDIR)/unpacked.ts +| \
    429         $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox.chm,) \
    430         $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual.qch $(PATH_TARGET)/UserManual.qhc,) \
    431         $(PATH_TARGET)/UserManual.pdf \
    432 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
    433         $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox_$(f).chm,) \
    434         $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual_$(f).qch $(PATH_TARGET)/UserManual_$(f).qhc,) \
    435         $(PATH_TARGET)/UserManual_$(f).pdf): \
    436                 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip
     397 endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER unless win.x86+combined
     398
     399
     400 #
     401 # Install documentation files (at the moment the .chm) from the build server.
     402 #
     403 ifdef VBOX_WITH_DOCS_FROM_BUILD_SERVER
     404  ## @todo r=bird: Too much mess now for $(PATH_TARGET); move to doc/manual/.
     405  INSTALLS += buildserver-docs
     406  buildserver-docs_INST = $(INST_BIN)
     407  buildserver-docs_MODE = 0644
     408  buildserver-docs_SOURCES = \
     409        $(addprefix $(PATH_TARGET)/, \
     410        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox.chm,) \
     411        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual.qch UserManual.qhc,) \
     412        UserManual.pdf \
     413        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
     414        $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),VirtualBox_$(f).chm,) \
     415        $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),UserManual_$(f).qch UserManual_$(f).qhc,) \
     416        UserManual_$(f).pdf))
     417  buildserver-docs_CLEANS = \
     418        $(buildserver-docs_0_OUTDIR)/unpacked.ts \
     419        $(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip \
     420        $(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip.tmp \
     421        $(addprefix $(PATH_TARGET)/, \
     422        VirtualBox.chm UserManual.qch UserManual.qhc UserManual.pdf \
     423        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
     424        VirtualBox_$(f).chm \
     425        UserManual_$(f).qch UserManual_$(f).qhc \
     426        UserManual_$(f).pdf))
     427
     428  $$(buildserver-docs_0_OUTDIR)/unpacked.ts +| \
     429  $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox.chm,) \
     430  $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual.qch $(PATH_TARGET)/UserManual.qhc,) \
     431  $(PATH_TARGET)/UserManual.pdf \
     432  $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES), \
     433  $(if-expr defined(VBOX_WITH_DOCS_CHM_PACKING),$(PATH_TARGET)/VirtualBox_$(f).chm,) \
     434  $(if-expr defined(VBOX_WITH_DOCS_QHELP_PACKING),$(PATH_TARGET)/UserManual_$(f).qch $(PATH_TARGET)/UserManual_$(f).qhc,) \
     435  $(PATH_TARGET)/UserManual_$(f).pdf): \
     436                $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip
    437437        $(call MSG_L1,Unpacking documentation)
    438438        $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET)
    … …  
    447447        $(APPEND) -t $@ "done"
    448448
    449 $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip: $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/documentation.sh | $$(dir $$@)
     449  $$(buildserver-docs_0_OUTDIR)/VBoxDocumentation.zip: $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/documentation.sh | $$(dir $$@)
    450450        $(RM) -f -- "$@" "[email protected]"
    451451        $(SHELL) $(KBUILD_DEVTOOLS)/bin/documentation.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
    452452        $(MV) -f -- "[email protected]" "$@"
    453453
    454 endif # VBOX_WITH_DOCS_FROM_BUILD_SERVER
     454 endif # VBOX_WITH_DOCS_FROM_BUILD_SERVER
    455455
    456456
    … …  
    494494   $$(buildserver-efifw_0_OUTDIR)/unpacked.ts \
    495495   +| $$(buildserver-efifw_0_OUTDIR)/VBoxEFI32.fd \
    496       $$(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd \
    497       $(foreach arch, amd64 x86, $(foreach mod,$(VBOX_EFI_MODULES_FLAT),$$(buildserver-efifw_0_OUTDIR)/$(arch)/$(mod).pdb)): \
     496   $$(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd \
     497   $(foreach arch, amd64 x86, $(foreach mod,$(VBOX_EFI_MODULES_FLAT),$$(buildserver-efifw_0_OUTDIR)/$(arch)/$(mod).pdb)): \
    498498                $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip
    499499        $(call MSG_L1,Unpacking EFI firmware)
    … …  
    508508
    509509   $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip: \
    510                 $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
     510                $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
    511511        $(RM) -f -- "$@" "[email protected]"
    512512        $(SHELL) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
    … …  
    527527
    528528
    529 ifdef VBOX_WITH_EXTPACKS_FROM_BUILD_SERVER
    530 #
    531 # Get the extension pack from from the build server to facility the automatic
    532 # testing (everything in one tarball (VBoxAll-*)).
    533 #
    534 # Note! Using the plural here as we might be downloading more packages eventually.
    535 #
    536 INSTALLS += buildserver-extpacks
    537 buildserver-extpacks_INST = $(INST_DIST)
    538 buildserver-extpacks_MODE = 0644
    539 buildserver-extpacks_SOURCES = \
    540         $(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack
    541 buildserver-extpacks_CLEANS = \
    542         $(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack \
    543         $(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack.tmp
    544 
    545 $$(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack: \
    546                 $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/extpacks.sh | $$(dir $$@)
     529 ifdef VBOX_WITH_EXTPACKS_FROM_BUILD_SERVER
     530  #
     531  # Get the extension pack from from the build server to facility the automatic
     532  # testing (everything in one tarball (VBoxAll-*)).
     533  #
     534  # Note! Using the plural here as we might be downloading more packages eventually.
     535  #
     536  INSTALLS += buildserver-extpacks
     537  buildserver-extpacks_INST = $(INST_DIST)
     538  buildserver-extpacks_MODE = 0644
     539  buildserver-extpacks_SOURCES = \
     540        $(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack
     541  buildserver-extpacks_CLEANS = \
     542        $(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack \
     543        $(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack.tmp
     544
     545  $$(buildserver-extpacks_0_OUTDIR)/Oracle_VM_VirtualBox_Extension_Pack.vbox-extpack: \
     546                $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/extpacks.sh | $$(dir $$@)
    547547        $(RM) -f -- "[email protected]" "$@"
    548548        $(SHELL) $(KBUILD_DEVTOOLS)/bin/extpacks.sh --cmd fetch --filename "[email protected]" --vbox-version "$(VBOX_VERSION_STRING_NO_PUB)" \
    … …  
    551551        $(TOUCH) -- "$@"
    552552
    553 endif
    554 
    555 
    556 #
    557 # Install staged binaries on platforms where we can't cross
    558 # compile things.
    559 #
    560 ifn1of ($(KBUILD_TARGET), linux win)
    561  VBOX_PATH_STAGED ?= .
    562 
    563  # Additions.
    564  ifndef VBOX_WITH_LINUX_ADDITIONS
    565   ifndef VBOX_WITH_WIN32_ADDITIONS
    566    ifneq ($(wildcard $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso),)
    567     INSTALLS += staged-additions
    568     staged-additions_INST = $(INST_ADDITIONS_ISO)
    569     staged-additions_MODE = 0644
    570     staged-additions_SOURCES = $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso
     553 endif
     554
     555
     556 #
     557 # Install staged binaries on platforms where we can't cross
     558 # compile things.
     559 #
     560 ifn1of ($(KBUILD_TARGET), linux win)
     561  VBOX_PATH_STAGED ?= .
     562
     563  # Additions.
     564  ifndef VBOX_WITH_LINUX_ADDITIONS
     565   ifndef VBOX_WITH_WIN32_ADDITIONS
     566    ifneq ($(wildcard $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso),)
     567     INSTALLS += staged-additions
     568     staged-additions_INST = $(INST_ADDITIONS_ISO)
     569     staged-additions_MODE = 0644
     570     staged-additions_SOURCES = $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso
     571    endif
    571572   endif
    572573  endif
     574
     575  # guesttool.exe
     576  ifndef VBOX_WITH_WIN32_ADDITIONS
     577   ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),)
     578    INSTALLS += staged-guesttool
     579    staged-guesttool_INST = $(INST_BIN)
     580    staged-guesttool_SOURCES = $(VBOX_PATH_STAGED)/guesttool.exe
     581   endif
     582  endif
     583
    573584 endif
    574585
    575  # guesttool.exe
    576  ifndef VBOX_WITH_WIN32_ADDITIONS
    577   ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),)
    578    INSTALLS += staged-guesttool
    579    staged-guesttool_INST = $(INST_BIN)
    580    staged-guesttool_SOURCES = $(VBOX_PATH_STAGED)/guesttool.exe
    581   endif
    582  endif
    583 
    584 endif
    585 
    586586endif # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_DOCS && !VBOX_ONLY_EXTPACKS && !VBOX_ONLY_VALIDATIONKIT
    587587
    588588
    589589ifdef VBOX_ONLY_DOCS
    590 # It may sound a bit odd, but for preparing the documentation package the
    591 # doxygen documentation isn't needed and increases the build time a lot.
    592 docs:
     590 # It may sound a bit odd, but for preparing the documentation package the
     591 # doxygen documentation isn't needed and increases the build time a lot.
     592 docs:
    593593else  # !VBOX_ONLY_DOCS
    594 #
    595 # Generate documentation.
    596 # (This should be converted into a separate pass or merged with an existing one later.)
    597 #
     594 #
     595 # Generate documentation.
     596 # (This should be converted into a separate pass or merged with an existing one later.)
     597 #
    598598 ifdef VBOX_WITH_ALL_DOXYGEN_TARGETS
    599 docs: docs.Core
     599  docs: docs.Core
    600600 else
    601 docs:
     601  docs:
    602602 endif
    603603endif # !VBOX_ONLY_DOCS
    … …  
    865865        src/VBox/ValidationKit/testmanager/cgi/ \
    866866        src/VBox/ValidationKit/testmanager/webui/ \
    867         src/VBox/ValidationKit/testboxscript/ \
     867        src/VBox/ValidationKit/testboxscript/
    868868
    869869# These must come first in order to make things look nice.
    870 VBOX_CORE_DOXYFILE_INPUT_FIRST =\
     870VBOX_CORE_DOXYFILE_INPUT_FIRST = \
    871871        $(PATH_ROOT)/doc/VBox-doc.c \
    872872        $(PATH_ROOT)/doc/VBox-CodingGuidelines.cpp \
    … …  
    944944        $(PATH_ROOT)/include/VBox/param.h \
    945945        $(PATH_ROOT)/include/VBox/version.h \
    946        \
     946        \
    947947        $(PATH_ROOT)/include/VBox/com/com.h \
    948948        $(PATH_ROOT)/include/VBox/com/utils.h
    … …  
    951951        $(filter-out %.cpp.h, $(sort $(wildcard $(addsuffix /*.h, $(VBOX_CORE_DOXYFILE_INPUT_DIRS)))) ) \
    952952        $(foreach dir, $(VBOX_CORE_DOXYFILE_INPUT_DIRS) \
    953                 , $(wildcard $(dir)/*.cpp $(dir)/*.c $(dir)/*.m $(dir)/*.mm $(dir)/*.py $(dir)/.asm))
     953        , $(wildcard $(dir)/*.cpp $(dir)/*.c $(dir)/*.m $(dir)/*.mm $(dir)/*.py $(dir)/.asm))
    954954VBOX_CORE_DOXYFILE_INPUT := \
    955955        $(VBOX_CORE_DOXYFILE_INPUT_FIRST) \
    … …  
    11061106# @param    3   nossh or empty
    11071107#
    1108 VBOX_RSYNC_IN_FN = $(if-expr "$(3)" != "nossh",$(VBOX_RSYNC),$(VBOX_RSYNC_NOSSH))\
     1108VBOX_RSYNC_IN_FN = $(if-expr "$(3)" != "nossh",$(VBOX_RSYNC),$(VBOX_RSYNC_NOSSH)) \
    11091109        -a -v --delete --delete-excluded --prune-empty-dirs \
    11101110        --exclude=*.pyc \
    … …  
    11201120        $(if-expr "$1" == "solaris",--exclude=tools/common/openwatcom/,) \
    11211121        $(foreach os,$(filter-out $(1), darwin freebsd linux solaris os2 win), \
    1122                 --exclude=tools/$(os)/ \
    1123                 --exclude=tools/$(os).x86/ \
    1124                 --exclude=tools/$(os).amd64/ \
    1125                 --exclude=tools/$(os).arm64/ )
     1122        --exclude=tools/$(os)/ \
     1123        --exclude=tools/$(os).x86/ \
     1124        --exclude=tools/$(os).amd64/ \
     1125        --exclude=tools/$(os).arm64/ )
    11261126
    11271127#
    … …  
    11401140VBOX_BLD_VM_FBSD_AMD64_IP        := 192.168.27.17
    11411141
    1142 VBOX_WITH_OS2_ADD_BUILD=1
     1142VBOX_WITH_OS2_ADD_BUILD = 1
    11431143
    11441144#
    … …  
    11871187# the order of the windows builds. TODO: Split building and packing for these two VMs.
    11881188additions-build: \
    1189         additions-build-rsync-into-vms \
    1190         additions-build-win.x86 \
    1191         additions-build-win.amd64 \
    1192         additions-build-solaris.amd64 \
    1193         additions-build-solaris.x86 \
    1194         additions-build-os2.x86 \
    1195         additions-build-linux \
    1196         additions-build-darwin.x86 \
    1197         additions-build-darwin.amd64
     1189                additions-build-rsync-into-vms \
     1190                additions-build-win.x86 \
     1191                additions-build-win.amd64 \
     1192                additions-build-solaris.amd64 \
     1193                additions-build-solaris.x86 \
     1194                additions-build-os2.x86 \
     1195                additions-build-linux \
     1196                additions-build-darwin.x86 \
     1197                additions-build-darwin.amd64
    11981198
    11991199additions-build-rsync-into-vms: \
    … …  
    12051205        $(call MSG_L1,Rsynced the sources + tools into the VMs.)
    12061206.NOTPARALLEL: additions-build-rsync-into-vms
    1207 .PHONY:       additions-build-rsync-into-vms
     1207.PHONY: additions-build-rsync-into-vms
    12081208
    12091209
    … …  
    12211221# bit before kicking off any UNIX guest or we'll run into file sharing issues.
    12221222ifeq ($(KBUILD_TARGET),win)
    1223 VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST = #additions-build-win.x86 additions-build-win.amd64
    1224 else
    1225 VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST =
     1223 VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST = #additions-build-win.x86 additions-build-win.amd64
     1224else
     1225 VBOX_ADDITIONS_BUILD_WIN_HOST_FIRST =
    12261226endif
    12271227
    12281228# ASSUMES the 32-bit edition has been built already. Also for serializing VM access.
    12291229ifeq ($(KBUILD_TARGET),win)
    1230 additions-build-win.amd64-just-build:
     1230 additions-build-win.amd64-just-build:
    12311231        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    1232 additions-build-win.amd64: additions-build-win.x86 additions-build-win.amd64-just-build
     1232 additions-build-win.amd64: additions-build-win.x86 additions-build-win.amd64-just-build
    12331233        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
    12341234else
    1235 additions-build-win.amd64: additions-build-win.x86
     1235 additions-build-win.amd64: additions-build-win.x86
    12361236        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 additions build+pack)
    12371237        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) ' cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing '
    … …  
    12401240
    12411241ifeq ($(KBUILD_TARGET),win)
    1242 additions-build-win.x86:
     1242 additions-build-win.x86:
    12431243        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    12441244        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
    12451245else
    1246 additions-build-win.x86:
     1246 additions-build-win.x86:
    12471247        $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 additions build.pack)
    12481248        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_WIN_X86_IP) ' cd e:/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_ADDITIONS_BUILD.x86) all packing '
    … …  
    12521252# ASSUMES the 64-bit edition are built first. This also serializes VM access.
    12531253ifeq ($(KBUILD_TARGET),solaris)
    1254 additions-build-solaris.amd64:
     1254 additions-build-solaris.amd64:
    12551255        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    12561256        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
    12571257
    1258 additions-build-solaris.x86: additions-build-solaris.amd64
     1258 additions-build-solaris.x86: additions-build-solaris.amd64
    12591259        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_ADD_HOST_BUILD_TWEAK)
    12601260        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 packing
    12611261
    1262 additions-build-solaris.rsync-into-vm:
    1263 else
    1264 additions-build-solaris.rsync-into-vm:
     1262 additions-build-solaris.rsync-into-vm:
     1263else
     1264 additions-build-solaris.rsync-into-vm:
    12651265        $(TIME) -- $(call VBOX_RSYNC_IN_FN,solaris,*) \
    12661266                '--exclude=src/VBox/Additions/WINNT/**' \
    … …  
    12691269                . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
    12701270
    1271 additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm
     1271 additions-build-solaris.build-it: additions-build-solaris.rsync-into-vm
    12721272        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 additions build+pack)
    12731273        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_SOLARIS_IP) ' cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing '
    … …  
    12771277        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 additions build+pack)
    12781278
    1279 additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it
     1279 additions-build-solaris.rsync-out-of-vm: additions-build-solaris.build-it
    12801280        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
    12811281        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    12821282
    1283 .NOTPARALLEL: additions-build-solaris.rsync-into-vm
    1284 .PHONY:      additions-build-solaris.rsync-into-vm additions-build-solaris.rsync-out-of-vm additions-build-solaris.build-it
    1285 
    1286 additions-build-solaris.amd64: additions-build-solaris.rsync-out-of-vm
    1287 additions-build-solaris.x86:  additions-build-solaris.rsync-out-of-vm
     1283 .NOTPARALLEL: additions-build-solaris.rsync-into-vm
     1284 .PHONY: additions-build-solaris.rsync-into-vm additions-build-solaris.rsync-out-of-vm additions-build-solaris.build-it
     1285
     1286 additions-build-solaris.amd64: additions-build-solaris.rsync-out-of-vm
     1287 additions-build-solaris.x86: additions-build-solaris.rsync-out-of-vm
    12881288endif
    12891289
    12901290ifdef VBOX_WITH_OS2_ADD_BUILD
    12911291 ifeq ($(KBUILD_TARGET),os2)
    1292 additions-build-os2.x86:
     1292  additions-build-os2.x86:
    12931293        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    12941294        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
    12951295
    1296 additions-build-os2.rsync-into-vm:
     1296  additions-build-os2.rsync-into-vm:
    12971297 else
    1298 additions-build-os2.rsync-into-vm:
     1298  additions-build-os2.rsync-into-vm:
    12991299        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
    13001300        $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*,nossh)\
    … …  
    13051305                . rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
    13061306
    1307 additions-build-os2.build-it: #additions-build-os2.rsync-into-vm
     1307  additions-build-os2.build-it: #additions-build-os2.rsync-into-vm
    13081308        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 additions build+pack)
    13091309        $(TIME) -- $(REDIRECT_EXT) --stdin-pipe -- rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing"
    13101310        $(call VBOX_BLD_VM_MSG_END__,OS/2 additions build+pack)
    13111311
    1312 additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
     1312  additions-build-os2.rsync-out-of-vm: additions-build-os2.build-it
    13131313        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
    13141314        $(TIME) -- $(VBOX_RSYNC_NOSSH) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/os2.x86 ./out
    13151315
    1316 .NOTPARALLEL: additions-build-os2.rsync-into-vm
    1317 .PHONY:      additions-build-os2.rsync-into-vm additions-build-os2.rsync-out-of-vm additions-build-os2.build-it
    1318 
    1319 additions-build-os2.x86: additions-build-os2.rsync-out-of-vm
     1316  .NOTPARALLEL: additions-build-os2.rsync-into-vm
     1317  .PHONY: additions-build-os2.rsync-into-vm additions-build-os2.rsync-out-of-vm additions-build-os2.build-it
     1318
     1319  additions-build-os2.x86: additions-build-os2.rsync-out-of-vm
    13201320 endif
    1321 #
    1322 else
    1323 additions-build-os2.x86:
    1324 # Dummy
     1321 #
     1322else
     1323 additions-build-os2.x86:
     1324 # Dummy
    13251325endif
    13261326
    13271327# Linux
    13281328ifeq ($(KBUILD_TARGET),linux)
    1329 additions-build-linux.amd64:
     1329 additions-build-linux.amd64:
    13301330        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    13311331        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
    13321332
    1333 additions-build-linux.x86:
     1333 additions-build-linux.x86:
    13341334        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    13351335        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1
    13361336
    1337 additions-build-linux: additions-build-linux.x86 additions-build-linux.amd64
     1337 additions-build-linux: additions-build-linux.x86 additions-build-linux.amd64
    13381338        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    13391339        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1
    13401340else
    1341 additions-build-linux.rsync-into-vm:
     1341 additions-build-linux.rsync-into-vm:
    13421342        $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) \
    13431343                '--exclude=src/VBox/Additions/WINNT/**' \
    … …  
    13461346                . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
    13471347
    1348 additions-build-linux.build-it: additions-build-linux.rsync-into-vm
     1348 additions-build-linux.build-it: additions-build-linux.rsync-into-vm
    13491349 ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING
    13501350        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions/greeter)
    … …  
    13671367        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions combine)
    13681368
    1369 additions-build-linux.rsync-out-of-vm: additions-build-linux.build-it
     1369 additions-build-linux.rsync-out-of-vm: additions-build-linux.build-it
    13701370        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.x86 out/
    13711371        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    13721372
    1373 .NOTPARALLEL: additions-build-linux.rsync-into-vm
    1374 .PHONY:      additions-build-linux.rsync-into-vm additions-build-linux.rsync-out-of-vm additions-build-linux.build-it
    1375 
    1376 additions-build-linux: additions-build-linux.rsync-out-of-vm
     1373 .NOTPARALLEL: additions-build-linux.rsync-into-vm
     1374 .PHONY: additions-build-linux.rsync-into-vm additions-build-linux.rsync-out-of-vm additions-build-linux.build-it
     1375
     1376 additions-build-linux: additions-build-linux.rsync-out-of-vm
    13771377endif
    13781378
    13791379# Darwin
    13801380ifeq ($(KBUILD_TARGET),darwin)
    1381 additions-build-darwin.amd64:
     1381 additions-build-darwin.amd64:
    13821382        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    13831383        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing
    13841384
    1385 additions-build-darwin.x86:
     1385 additions-build-darwin.x86:
    13861386        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) all $(VBOX_ADD_HOST_BUILD_TWEAK)
    13871387        + $(TIME) -- $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing
    13881388
    1389 additions-build-darwin:  additions-build-darwin.amd64 additions-build-darwin.x86
    1390 .PHONY:      additions-build-darwin.amd64 additions-build-darwin.x86
    1391 else
    1392 additions-build-darwin.amd64.rsync-into-vm:
     1389 additions-build-darwin: additions-build-darwin.amd64 additions-build-darwin.x86
     1390 .PHONY: additions-build-darwin.amd64 additions-build-darwin.x86
     1391else
     1392 additions-build-darwin.amd64.rsync-into-vm:
    13931393        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_109_AMD64_IP) 'sudo rm -Rf /Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/'
    13941394        $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,*) \
    … …  
    14281428                . $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
    14291429
    1430 additions-build-darwin.x86.rsync-into-vm:
     1430 additions-build-darwin.x86.rsync-into-vm:
    14311431        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) 'sudo rm -Rf /Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/'
    14321432        $(TIME) -- $(call VBOX_RSYNC_IN_FN,darwin,*) \
    … …  
    14661466                . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)
    14671467
    1468 additions-build-darwin.amd64.build-it: additions-build-darwin.amd64.rsync-into-vm
     1468 additions-build-darwin.amd64.build-it: additions-build-darwin.amd64.rsync-into-vm
    14691469        $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 Additions)
    14701470        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_109_AMD64_IP) 'cd /Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all '     # VBOX_DEF_MACOSX_VERSION_MIN=10.7
    … …  
    14721472        $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 Additions)
    14731473
    1474 additions-build-darwin.x86.build-it: additions-build-darwin.x86.rsync-into-vm
     1474 additions-build-darwin.x86.build-it: additions-build-darwin.x86.rsync-into-vm
    14751475        $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 Additions)
    14761476        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) 'cd /Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all '     # VBOX_DEF_MACOSX_VERSION_MIN=10.5
    1477 # no pkgbuild # $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) 'cd /Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) packing ' # VBOX_DEF_MACOSX_VERSION_MIN=10.5
     1477 # no pkgbuild #        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) 'cd /Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) packing ' # VBOX_DEF_MACOSX_VERSION_MIN=10.5
    14781478        $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 Additions)
    14791479
    1480 additions-build-darwin.amd64.rsync-out-of-vm: additions-build-darwin.amd64.build-it
     1480 additions-build-darwin.amd64.rsync-out-of-vm: additions-build-darwin.amd64.build-it
    14811481        $(TIME) -- $(VBOX_RSYNC) -a -v --delete $(VBOX_BLD_VM_DARWIN_109_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
    14821482
    1483 additions-build-darwin.x86.rsync-out-of-vm: additions-build-darwin.x86.build-it
     1483 additions-build-darwin.x86.rsync-out-of-vm: additions-build-darwin.x86.build-it
    14841484        $(TIME) -- $(VBOX_RSYNC) -a -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
    14851485
    1486 additions-build-darwin.amd64: additions-build-darwin.amd64.rsync-out-of-vm
    1487 additions-build-darwin.x86: additions-build-darwin.x86.rsync-out-of-vm
    1488 additions-build-darwin: additions-build-darwin.x86.rsync-out-of-vm additions-build-darwin.amd64.rsync-out-of-vm
    1489 
    1490 .PHONY: additions-build-darwin.amd64.rsync-into-vm additions-build-darwin.amd64.rsync-out-of-vm additions-build-darwin.amd64.build-it \
    1491         additions-build-darwin.x86.rsync-into-vm additions-build-darwin.x86.rsync-out-of-vm additions-build-darwin.x86.build-it
     1486 additions-build-darwin.amd64: additions-build-darwin.amd64.rsync-out-of-vm
     1487 additions-build-darwin.x86: additions-build-darwin.x86.rsync-out-of-vm
     1488 additions-build-darwin: additions-build-darwin.x86.rsync-out-of-vm additions-build-darwin.amd64.rsync-out-of-vm
     1489
     1490 .PHONY: additions-build-darwin.amd64.rsync-into-vm additions-build-darwin.amd64.rsync-out-of-vm additions-build-darwin.amd64.build-it \
     1491                additions-build-darwin.x86.rsync-into-vm additions-build-darwin.x86.rsync-out-of-vm additions-build-darwin.x86.build-it
    14921492endif
    14931493
    … …  
    15121512
    15131513.PHONY: \
    1514         additions-build-win.x86 \
    1515         additions-build-win.amd64 \
    1516         additions-build-solaris.amd64 \
    1517         additions-build-solaris.x86 \
    1518         additions-build-os2.x86 \
    1519         additions-build-linux \
    1520         additions-build-linux.amd64 \
    1521         additions-build-linux.x86 \
    1522         additions-build-linux.x86.combined \
    1523         additions-build-darwin \
    1524         additions-build-darwin.x86 \
    1525         additions-build-darwin.amd64 \
    1526         additions-packing
     1514                additions-build-win.x86 \
     1515                additions-build-win.amd64 \
     1516                additions-build-solaris.amd64 \
     1517                additions-build-solaris.x86 \
     1518                additions-build-os2.x86 \
     1519                additions-build-linux \
     1520                additions-build-linux.amd64 \
     1521                additions-build-linux.x86 \
     1522                additions-build-linux.x86.combined \
     1523                additions-build-darwin \
     1524                additions-build-darwin.x86 \
     1525                additions-build-darwin.amd64 \
     1526                additions-packing
    15271527
    15281528
    … …  
    15451545if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    15461546        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  VBOX_ONLY_EXTPACKS=1
    1547 #       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
     1547 #      + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd VBOX_ONLY_EXTPACKS=1
    15481548        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   VBOX_ONLY_EXTPACKS=1
    1549 #       + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     VBOX_ONLY_EXTPACKS=1
     1549 #      + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     VBOX_ONLY_EXTPACKS=1
    15501550        + $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     VBOX_ONLY_EXTPACKS=1
    15511551endif
    … …  
    15531553
    15541554extpacks-build: \
    1555         extpacks-build-win.amd64 \
    1556         extpacks-build-win.x86 \
    1557         extpacks-build-solaris.amd64 \
    1558         extpacks-build-os2.x86 \
    1559         extpacks-build-linux \
    1560         extpacks-build-darwin.amd64 \
    1561         extpacks-build-darwin.arm64 \
    1562         extpacks-build-freebsd.amd64 \
    1563         extpacks-build-freebsd.x86
     1555                extpacks-build-win.amd64 \
     1556                extpacks-build-win.x86 \
     1557                extpacks-build-solaris.amd64 \
     1558                extpacks-build-os2.x86 \
     1559                extpacks-build-linux \
     1560                extpacks-build-darwin.amd64 \
     1561                extpacks-build-darwin.arm64 \
     1562                extpacks-build-freebsd.amd64 \
     1563                extpacks-build-freebsd.x86
    15641564
    15651565VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 VBOX_WITH_MAIN_NLS= VBOX_WITH_PUEL_NLS_NO_QM=1 \
    … …  
    15851585# bit before kicking off any UNIX guest or we'll run into file sharing issues.
    15861586ifeq ($(KBUILD_TARGET),win)
    1587 VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
    1588 else
    1589 VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
     1587 VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
     1588else
     1589 VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
    15901590endif
    15911591
    … …  
    16131613
    16141614ifeq ($(KBUILD_TARGET),solaris)
    1615 extpacks-build-solaris.amd64:
     1615 extpacks-build-solaris.amd64:
    16161616        + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    16171617
    16181618else
    1619 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
    1620 extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
     1619 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
     1620 extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    16211621        $(TIME) -- $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
    16221622
    1623 extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
     1623 extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
    16241624        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
    16251625        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_SOLARIS_IP)  'cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all '
    16261626        $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
    16271627
    1628 extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
     1628 extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
    16291629        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    16301630
    1631 #.NOTPARALLEL: extpacks-build-solaris.rsync-into-vm
    1632 .PHONY:      extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
    1633 
    1634 extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
     1631 #.NOTPARALLEL: extpacks-build-solaris.rsync-into-vm
     1632 .PHONY: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
     1633
     1634 extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
    16351635endif
    16361636
    … …  
    16431643
    16441644ifeq ($(KBUILD_TARGET),linux)
    1645 extpacks-build-linux.amd64:  $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
     1645 extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    16461646        + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    16471647
    1648 extpacks-build-linux.x86:  $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
     1648 extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    16491649 if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    16501650        + $(TIME) -- $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_EXTRA) $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
    … …  
    16531653 endif
    16541654
    1655 extpacks-build-linux: extpacks-build-linux.x86 extpacks-build-linux.amd64
    1656 else
    1657 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
    1658 extpacks-build-linux.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
     1655 extpacks-build-linux: extpacks-build-linux.x86 extpacks-build-linux.amd64
     1656else
     1657 # Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
     1658 extpacks-build-linux.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
    16591659        $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
    16601660
    1661 extpacks-build-linux.build-it: extpacks-build-linux.rsync-into-vm
     1661 extpacks-build-linux.build-it: extpacks-build-linux.rsync-into-vm
    16621662        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
    16631663        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_IP)         'dchroot -c debian-4.0-amd64 "cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all " '
    … …  
    16691669 endif
    16701670
    1671 extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it
     1671 extpacks-build-linux.rsync-out-of-vm: extpacks-build-linux.build-it
    16721672 if1of (x86, $(VBOX_SUPPORTED_HOST_ARCHS))
    16731673        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.x86 out/
    … …  
    16751675        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    16761676
    1677 #.NOTPARALLEL: extpacks-build-linux.rsync-into-vm
    1678 .PHONY:      extpacks-build-linux.rsync-out-of-vm extpacks-build-linux.rsync-into-vm extpacks-build-linux.build-it
    1679 
    1680 extpacks-build-linux: extpacks-build-linux.rsync-out-of-vm
     1677 #.NOTPARALLEL: extpacks-build-linux.rsync-into-vm
     1678 .PHONY: extpacks-build-linux.rsync-out-of-vm extpacks-build-linux.rsync-into-vm extpacks-build-linux.build-it
     1679
     1680 extpacks-build-linux: extpacks-build-linux.rsync-out-of-vm
    16811681endif
    16821682
    … …  
    17321732
    17331733.PHONY: \
    1734         extpacks-build-win.x86 \
    1735         extpacks-build-win.amd64 \
    1736         extpacks-build-solaris.amd64 \
    1737         extpacks-build-os2.x86 \
    1738         extpacks-build-linux \
    1739         extpacks-build-linux.amd64 \
    1740         extpacks-build-linux.x86 \
    1741         extpacks-build-freebsd.amd64 \
    1742         extpacks-build-freebsd.x86 \
    1743         extpacks-build-darwin.amd64 \
    1744         extpacks-packing
     1734                extpacks-build-win.x86 \
     1735                extpacks-build-win.amd64 \
     1736                extpacks-build-solaris.amd64 \
     1737                extpacks-build-os2.x86 \
     1738                extpacks-build-linux \
     1739                extpacks-build-linux.amd64 \
     1740                extpacks-build-linux.x86 \
     1741                extpacks-build-freebsd.amd64 \
     1742                extpacks-build-freebsd.x86 \
     1743                extpacks-build-darwin.amd64 \
     1744                extpacks-packing
    17451745
    17461746
    … …  
    17671767
    17681768validationkit-build: \
    1769         validationkit-build-rsync-into-vms \
    1770         validationkit-build-solaris.amd64 \
    1771         validationkit-build-solaris.x86 \
    1772         validationkit-build-win.x86 \
    1773         validationkit-build-win.amd64 \
    1774         validationkit-build-os2.x86 \
    1775         validationkit-build-linux \
    1776         validationkit-build-freebsd.amd64 \
    1777         validationkit-build-freebsd.x86 \
    1778         validationkit-build-darwin.amd64 \
    1779         validationkit-build-darwin.x86
     1769                validationkit-build-rsync-into-vms \
     1770                validationkit-build-solaris.amd64 \
     1771                validationkit-build-solaris.x86 \
     1772                validationkit-build-win.x86 \
     1773                validationkit-build-win.amd64 \
     1774                validationkit-build-os2.x86 \
     1775                validationkit-build-linux \
     1776                validationkit-build-freebsd.amd64 \
     1777                validationkit-build-freebsd.x86 \
     1778                validationkit-build-darwin.amd64 \
     1779                validationkit-build-darwin.x86
    17801780
    17811781validationkit-build-rsync-into-vms: \
    … …  
    17851785        $(call MSG_L1,Rsynced the sources + tools into the VMs.)
    17861786.NOTPARALLEL: validationkit-build-rsync-into-vms
    1787 .PHONY:       validationkit-build-rsync-into-vms
     1787.PHONY: validationkit-build-rsync-into-vms
    17881788
    17891789
    … …  
    18011801# bit before kicking off any UNIX guest or we'll run into file sharing issues.
    18021802ifeq ($(KBUILD_TARGET),win)
    1803 VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST = validationkit-build-win.x86 validationkit-build-win.amd64
    1804 else
    1805 VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST =
     1803 VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST = validationkit-build-win.x86 validationkit-build-win.amd64
     1804else
     1805 VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST =
    18061806endif
    18071807
    … …  
    18251825
    18261826ifeq ($(KBUILD_TARGET),solaris)
    1827 validationkit-build-solaris.amd64:
     1827 validationkit-build-solaris.amd64:
    18281828        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    18291829
    1830 validationkit-build-solaris.x86:
     1830 validationkit-build-solaris.x86:
    18311831        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86)   all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    18321832
    18331833else
    1834 validationkit-build-solaris.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1834 validationkit-build-solaris.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    18351835        $(TIME) -- $(call VBOX_RSYNC_IN_FN,solaris,*) \
    18361836                '--exclude=src/VBox/Additions/WINNT/**' \
    … …  
    18391839                . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
    18401840
    1841 validationkit-build-solaris.build-it: validationkit-build-solaris.rsync-into-vm
     1841 validationkit-build-solaris.build-it: validationkit-build-solaris.rsync-into-vm
    18421842        $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 Validation Kit)
    18431843        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_SOLARIS_IP) 'cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all '
    … …  
    18471847        $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 Validation Kit)
    18481848
    1849 validationkit-build-solaris.rsync-out-of-vm: validationkit-build-solaris.build-it
     1849 validationkit-build-solaris.rsync-out-of-vm: validationkit-build-solaris.build-it
    18501850        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.x86   out/
    18511851        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
    18521852
    1853 .PHONY:      validationkit-build-solaris.rsync-out-of-vm validationkit-build-solaris.rsync-into-vm validationkit-build-solaris.build-it
    1854 
    1855 validationkit-build-solaris.amd64: validationkit-build-solaris.rsync-out-of-vm
    1856 validationkit-build-solaris.x86:  validationkit-build-solaris.rsync-out-of-vm
     1853 .PHONY: validationkit-build-solaris.rsync-out-of-vm validationkit-build-solaris.rsync-into-vm validationkit-build-solaris.build-it
     1854
     1855 validationkit-build-solaris.amd64: validationkit-build-solaris.rsync-out-of-vm
     1856 validationkit-build-solaris.x86: validationkit-build-solaris.rsync-out-of-vm
    18571857endif
    18581858
    18591859ifeq ($(KBUILD_TARGET),os2)
    1860 validationkit-build-os2.x86:
     1860 validationkit-build-os2.x86:
    18611861        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    1862 validationkit-build-os2.rsync-into-vm:
     1862 validationkit-build-os2.rsync-into-vm:
    18631863else # !OS/2
    1864 validationkit-build-os2.rsync-into-vm:
     1864 validationkit-build-os2.rsync-into-vm:
    18651865        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
    18661866        $(TIME) -- $(call VBOX_RSYNC_IN_FN,os2,*,nossh) \
    … …  
    18711871                . rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
    18721872
    1873 validationkit-build-os2.build-it: validationkit-build-os2.rsync-into-vm
     1873 validationkit-build-os2.build-it: validationkit-build-os2.rsync-into-vm
    18741874        $(call VBOX_BLD_VM_MSG_BEGIN,OS/2 Validation Kit)
    18751875        $(TIME) -- $(REDIRECT_EXT) --stdin-pipe -- rsh -l vbox $(VBOX_BLD_VM_OS2_IP) "cd e:\\tinderbox\\$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && e: && kbuild\\bin\\os2.x86\\kmk_ash tools\\env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.x86) all"
    18761876        $(call VBOX_BLD_VM_MSG_END__,OS/2 Validation Kit)
    18771877
    1878 validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
     1878 validationkit-build-os2.rsync-out-of-vm: validationkit-build-os2.build-it
    18791879        -$(VBOX_BLD_VM_OS2_KKILL_STUFF)
    18801880        $(TIME) -- $(VBOX_RSYNC_NOSSH) -v -a --delete rsync://vbox@$(VBOX_BLD_VM_OS2_IP)/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/os2.x86 ./out
    18811881
    1882 .PHONY:      validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it
    1883 
    1884 validationkit-build-os2.x86: validationkit-build-os2.rsync-out-of-vm
     1882 .PHONY: validationkit-build-os2.rsync-into-vm validationkit-build-os2.rsync-out-of-vm validationkit-build-os2.build-it
     1883
     1884 validationkit-build-os2.x86: validationkit-build-os2.rsync-out-of-vm
    18851885endif # !OS/2
    18861886
    18871887ifeq ($(KBUILD_TARGET),linux)
    1888 validationkit-build-linux.amd64:
     1888 validationkit-build-linux.amd64:
    18891889        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    18901890
    1891 validationkit-build-linux.x86:
     1891 validationkit-build-linux.x86:
    18921892        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86)   all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    18931893
    1894 validationkit-build-linux: validationkit-build-linux.x86 validationkit-build-linux.amd64
    1895 else
    1896 validationkit-build-linux.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1894 validationkit-build-linux: validationkit-build-linux.x86 validationkit-build-linux.amd64
     1895else
     1896 validationkit-build-linux.rsync-into-vm: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    18971897        $(TIME) -- $(call VBOX_RSYNC_IN_FN,linux,*) \
    18981898                '--exclude=src/VBox/Additions/WINNT/**' \
    … …  
    19011901                . $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)
    19021902
    1903 validationkit-build-linux.build-it: validationkit-build-linux.rsync-into-vm
     1903 validationkit-build-linux.build-it: validationkit-build-linux.rsync-into-vm
    19041904        $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 Validation Kit)
    19051905        $(TIME) -- $(VBOX_SSH) vbox@$(VBOX_BLD_VM_LNX_IP)         'dchroot -c debian-4.0-amd64 "cd /mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_VALIDATIONKIT_BUILD.amd64) all " '
    … …  
    19091909        $(call VBOX_BLD_VM_MSG_END__,Linux/x86 Validation Kit)
    19101910
    1911 validationkit-build-linux.rsync-out-of-vm: validationkit-build-linux.build-it
     1911 validationkit-build-linux.rsync-out-of-vm: validationkit-build-linux.build-it
    19121912        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.x86   out/
    19131913        $(TIME) -- $(VBOX_RSYNC) -a --delete $(VBOX_BLD_VM_LNX_IP):/mnt/tinderbox/$(VBOX_VALIDATIONKIT_BUILD_SUBDIRNAME)/out/linux.amd64 out/
    19141914
    1915 .PHONY:      validationkit-build-linux.rsync-out-of-vm validationkit-build-linux.rsync-into-vm validationkit-build-linux.build-it
    1916 
    1917 validationkit-build-linux: validationkit-build-linux.rsync-out-of-vm
    1918 endif
    1919 
    1920 validationkit-build-freebsd.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1915 .PHONY: validationkit-build-linux.rsync-out-of-vm validationkit-build-linux.rsync-into-vm validationkit-build-linux.build-it
     1916
     1917 validationkit-build-linux: validationkit-build-linux.rsync-out-of-vm
     1918endif
     1919
     1920validationkit-build-freebsd.amd64: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    19211921#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
    19221922#       + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    … …  
    19271927#endif
    19281928
    1929 validationkit-build-freebsd.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1929validationkit-build-freebsd.x86: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    19301930#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
    19311931#       + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    … …  
    19361936#endif
    19371937
    1938 validationkit-build-darwin.amd64:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1938validationkit-build-darwin.amd64: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    19391939ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
    19401940        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.amd64) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    … …  
    19471947endif
    19481948
    1949 validationkit-build-darwin.x86:   $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
     1949validationkit-build-darwin.x86: $(VBOX_VALIDATIONKIT_BUILD_WIN_HOST_FIRST)
    19501950ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
    19511951        + $(TIME) -- $(KMK) $(VBOX_VALIDATIONKIT_BUILD.x86) all $(VBOX_VALIDATIONKIT_HOST_BUILD_TWEAK)
    … …  
    19771977
    19781978.PHONY: \
    1979         validationkit-build-win.x86 \
    1980         validationkit-build-win.amd64 \
    1981         validationkit-build-solaris.amd64 \
    1982         validationkit-build-solaris.x86 \
    1983         validationkit-build-os2.x86 \
    1984         validationkit-build-linux \
    1985         validationkit-build-linux.amd64 \
    1986         validationkit-build-linux.x86 \
    1987         validationkit-build-freebsd.amd64 \
    1988         validationkit-build-freebsd.x86 \
    1989         validationkit-build-darwin.amd64 \
    1990         validationkit-build-darwin.x86 \
    1991         validationkit-packing
     1979                validationkit-build-win.x86 \
     1980                validationkit-build-win.amd64 \
     1981                validationkit-build-solaris.amd64 \
     1982                validationkit-build-solaris.x86 \
     1983                validationkit-build-os2.x86 \
     1984                validationkit-build-linux \
     1985                validationkit-build-linux.amd64 \
     1986                validationkit-build-linux.x86 \
     1987                validationkit-build-freebsd.amd64 \
     1988                validationkit-build-freebsd.x86 \
     1989                validationkit-build-darwin.amd64 \
     1990                validationkit-build-darwin.x86 \
     1991                validationkit-packing
    19921992
    19931993
    … …  
    21462146#
    21472147quick: \
    2148         VBoxRT \
    2149         VBoxVMM \
    2150         VMMR0 \
    2151         VBoxDD \
    2152         VBoxDDR0 \
    2153         VBoxDD2 \
    2154         VBoxDD2R0 \
    2155         VBoxC \
    2156         VBoxSVC \
    2157         $(if-expr defined(VBOX_WITH_RAW_MODE),VMMRC VBoxDDRC VBoxDD2RC,) \
    2158         $(if-expr defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win",VBoxProxyStub,) \
    2159         $(if-expr defined(VBOX_WITH_SDS),VBoxSDS,) \
    2160         $(if-expr defined(VBOX_WITH_QTGUI),VirtualBox,)
     2148                VBoxRT \
     2149                VBoxVMM \
     2150                VMMR0 \
     2151                VBoxDD \
     2152                VBoxDDR0 \
     2153                VBoxDD2 \
     2154                VBoxDD2R0 \
     2155                VBoxC \
     2156                VBoxSVC \
     2157                $(if-expr defined(VBOX_WITH_RAW_MODE),VMMRC VBoxDDRC VBoxDD2RC,) \
     2158                $(if-expr defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win",VBoxProxyStub,) \
     2159                $(if-expr defined(VBOX_WITH_SDS),VBoxSDS,) \
     2160                $(if-expr defined(VBOX_WITH_QTGUI),VirtualBox,)
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