Changeset 107139 in vbox for trunk/src/VBox/Installer/linux/debian/rules

Timestamp:

Nov 26, 2024 10:19:37 AM (2 months ago)

Author:

vboxsync

Message:

Devices,Main,Installer,/Makefile.kmk: Take ARM EFI firmwares from the same build box as the x86 & amd64 ones (efi2). Renamed the firmware images and internal variables to include full arch (kbuild style) for x86 & amd64 as well. jiraref:VBP-1458

File:

• trunk/src/VBox/Installer/linux/debian/rules (modified) (2 diffs)

trunk/src/VBox/Installer/linux/debian/rules

@@ -84 +84 @@
 NOSDL    ?= $(HEADLESS)
 NOWEBSVC ?=
-EFI      ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,)
+EFI      ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI-x86.fd $(vboxroot)/prebuild/VBoxEFI-amd64.fd),1,)
 NODOCS   ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc)),1,)
 STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,)
@@ -170 +170 @@
         # packing stage, overriding what the build did/would produce.
         $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc) $(builddir)/bin,)
-        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,)
-        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,)
+        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI-x86.fd $(builddir)/bin,)
+        $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI-amd64.fd $(builddir)/bin,)
         mkdir -p $(builddir)/bin/additions
         $(if $(STAGEDISO),cp $(STAGEDISO)/VBoxGuestAdditions.iso $(builddir)/bin/additions,)