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

Timestamp:

Dec 13, 2024 9:29:59 PM (5 weeks ago)

Author:

vboxsync

Message:

Additions: The "use last arch specific additions path for VBOX_PATH_ADDITIONS.win" approach falls to pieces if the last one uses different signing parameters (no dual signing) than the "usual" arch. Made this a bit smarter by picking the one for the target arch active during packing, but overall this approach isn't right. It would need merging of file lists across all archs and removing 'relative path duplicates' (which still assumes that same name=same content which isn't absolutely guaranteed either).

File:

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

trunk/src/VBox/Additions/Makefile.kmk

@@ -300 +300 @@
 ifdef VBOX_WITH_ADDITIONS_ISO.win.amd64
  VBOX_PATH_ADDITIONS.win.amd64 = $(PATH_OUT_BASE)/win.amd64/$(KBUILD_TYPE)/bin/additions
- VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.amd64)
+ ifeq ($(KBUILD_TARGET_ARCH),amd64)
+  VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.amd64)
+ endif
  GUESTADDITIONS_FILESPEC.win.amd64 = \
         VBoxWindowsAdditions-amd64.exe=$(VBOX_PATH_ADDITIONS.win.amd64)/VBoxWindowsAdditions-amd64.exe
@@ -311 +313 @@
 ifdef VBOX_WITH_ADDITIONS_ISO.win.x86
  VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions
- VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.x86)
+ ifeq ($(KBUILD_TARGET_ARCH),x86)
+  VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.x86)
+ endif
  GUESTADDITIONS_FILESPEC.win.x86 = \
         VBoxWindowsAdditions-x86.exe=$(VBOX_PATH_ADDITIONS.win.x86)/VBoxWindowsAdditions-x86.exe \
@@ -327 +331 @@
 ifdef VBOX_WITH_ADDITIONS_ISO.win.arm64
  VBOX_PATH_ADDITIONS.win.arm64 = $(PATH_OUT_BASE)/win.arm64/$(KBUILD_TYPE)/bin/additions
- VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.arm64)
+ ifeq ($(KBUILD_TARGET_ARCH),arm64)
+  VBOX_PATH_ADDITIONS.win = $(VBOX_PATH_ADDITIONS.win.arm64)
+ endif
  GUESTADDITIONS_FILESPEC.win.arm64 = \
         VBoxWindowsAdditions-arm64.exe=$(VBOX_PATH_ADDITIONS.win.arm64)/VBoxWindowsAdditions-arm64.exe