Changeset 107139 in vbox for trunk/src/VBox/Installer

Timestamp:

Nov 26, 2024 10:19:37 AM (8 weeks 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

Location:

trunk/src/VBox/Installer

Files:

• darwin/Makefile.kmk (modified) (1 diff)
• freebsd/Makefile.kmk (modified) (1 diff)
• linux/Makefile.kmk (modified) (1 diff)
• linux/debian/rules (modified) (2 diffs)
• linux/rpm/rules (modified) (2 diffs)
• solaris/Makefile.kmk (modified) (2 diffs)
• win/VBoxMergeApp.wxi (modified) (1 diff)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -579 +579 @@
 ifdef VBOX_WITH_EFIFW_PACKING
  VBOX_DI_VBAPP_MISC_FILES += \
-        MacOS/VBoxEFI32.fd \
-        MacOS/VBoxEFI64.fd
+        MacOS/VBoxEFI-x86.fd \
+        MacOS/VBoxEFI-amd64.fd
 endif
 VBOX_DI_VBAPP_SYMLINKS =

trunk/src/VBox/Installer/freebsd/Makefile.kmk

@@ -134 +134 @@
 ifdef VBOX_WITH_EFIFW_PACKING
  VBOX_FBSD_NO_STRIP += \
-        VBoxEFI32.fd \
-        VBoxEFI64.fd
+        VBoxEFI-x86.fd \
+        VBoxEFI-amd64.fd
 endif
 

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -358 +358 @@
 ifdef VBOX_WITH_EFIFW_PACKING
  VBOX_LNX_NO_STRIP += \
-        VBoxEFI32.fd \
-        VBoxEFI64.fd
+        VBoxEFI-x86.fd \
+        VBoxEFI-amd64.fd
 endif
 

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,)

trunk/src/VBox/Installer/linux/rpm/rules

@@ -74 +74 @@
 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,)
@@ -213 +213 @@
         # 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,)

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -503 +503 @@
 ifdef VBOX_WITH_EFIFW_PACKING
  SOLARIS_COMMON += \
-        VBoxEFI32.fd \
-        VBoxEFI64.fd
+        VBoxEFI-x86.fd \
+        VBoxEFI-amd64.fd
 endif
 
@@ -620 +620 @@
 
         $(if-expr defined(VBOX_WITH_EFIFW_PACKING) \
-        ,$(LN_SYMLINK) ../VBoxEFI32.fd ../VBoxEFI64.fd $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,)
+        ,$(LN_SYMLINK) ../VBoxEFI-x86.fd ../VBoxEFI-amd64.fd $(VBOX_PATH_SI_SCRATCH_PKG)/opt/VirtualBox/$(VBOX_SI_ARCH)/,)
 
 # Links to /usr/bin.

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -327 +327 @@
         <!-- EFI firmware -->
 <?if $(env.VBOX_WITH_EFIFW_PACKING) = "yes" ?>
-        <File Id="file_VBoxEFI32.fd" Name="VBoxEFI32.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI32.fd" />
-        <File Id="file_VBoxEFI64.fd" Name="VBoxEFI64.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI64.fd" />
+        <File Id="file_VBoxEFI-x86.fd"   Name="VBoxEFI-x86.fd"   DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI-x86.fd" />
+        <File Id="file_VBoxEFI-amd64.fd" Name="VBoxEFI-amd64.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI-amd64.fd" />
     <?if $(env.KBUILD_TARGET_ARCH) = "arm64" ?>
-        <File Id="file_VBoxEFIAArch32.fd" Name="VBoxEFIAArch32.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFIAArch32.fd" />
-        <File Id="file_VBoxEFIAArch64.fd" Name="VBoxEFIAArch64.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFIAArch64.fd" />
+        <File Id="file_VBoxEFI-arm32.fd" Name="VBoxEFI-arm32.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI-arm32.fd" />
+        <File Id="file_VBoxEFI-arm64.fd" Name="VBoxEFI-arm64.fd" DiskId="$(var.Property_DiskIdCommon)" Source="$(env.PATH_OUT)\bin\VBoxEFI-arm64.fd" />
     <?endif?>
 <?endif?>