Changeset 24818 in vbox

Timestamp:

Nov 20, 2009 10:14:25 AM (15 years ago)

Author:

vboxsync

Message:

EFI: build and pack 64-bit firmware

Location:

trunk

Files:

• Makefile.kmk (modified) (2 diffs)
• src/VBox/Devices/EFI/FirmwareBin/vboxefi.fv (modified) ( previous)
• src/VBox/Installer/freebsd/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/solaris/Makefile.kmk (modified) (4 diffs)

trunk/Makefile.kmk

@@ -299 +299 @@
 buildserver-efifw_MODE = 0644
 buildserver-efifw_SOURCES = \
-        $(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd=>vboxefi.fv
+        $(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd=>vboxefi.fv \
+        $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd=>vboxefi64.fv
 buildserver-efifw_CLEANS = \
         $(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd \
+        $(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd \
         $(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip \
         $(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
@@ -335 +337 @@
 local-efifw_MODE = 0644
 local-efifw_SOURCES = \
-        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/vboxefi.fv=>vboxefi.fv
+        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/vboxefi.fv=>vboxefi.fv \
+        $(PATH_ROOT)/src/VBox/Devices/EFI/FirmwareBin/vboxefi64.fv=>vboxefi64.fv
 endif # VBOX_WITH_EFIFW_FROM_BUILD_SERVER
 

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

@@ -131 +131 @@
         vboxdrv.tar.gz
 
+# EFI firmware
+ifdef VBOX_WITH_EFIFW_PACKING
+  VBOX_FBSD_NO_STRIP += \
+        vboxefi.fv \
+        vboxefi64.fv
+endif
+
 # Symlinks residing in bin/
 VBOX_FBSD_SYMLINKS = \

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

@@ -240 +240 @@
 ifdef VBOX_WITH_EFIFW_PACKING
   VBOX_LNX_NO_STRIP += \
-        vboxefi.fv
+        vboxefi.fv     \
+        vboxefi64.fv
 endif
 

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

@@ -314 +314 @@
 ifdef VBOX_WITH_DOCS_PACKING
  SOLARIS_COMMON = \
-        VirtualBox.chm \
+        VirtualBox.chm \
         UserManual.pdf \
         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)
@@ -360 +360 @@
 ifdef VBOX_WITH_ADDITIONS_PACKING
  SOLARIS_COMMON += \
-        additions/VBoxGuestAdditions.iso
+        additions/VBoxGuestAdditions.iso
 endif
 
@@ -367 +367 @@
 ifdef VBOX_WITH_EFIFW_PACKING
   SOLARIS_COMMON += \
-        vboxefi.fv
+        vboxefi.fv \
+        vboxefi64.fv      
 endif
 
@@ -546 +547 @@
         $(QUIET)$(if $(VBOX_WITH_QTGUI),$(LN_SYMLINK) -f ../VirtualBox.chm                                                   $(SOLARIS_VBOXINST_DIR_64)/VirtualBox.chm,)
         $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../vboxefi.fv                                               $(SOLARIS_VBOXINST_DIR_64)/vboxefi.fv,)
-        $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../vboxefi.fv                                               $(SOLARIS_VBOXINST_DIR_32)/vboxefi.fv,)
+        $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../vboxefi.fv                                               $(SOLARIS_VBOXINST_DIR_32)/vboxefi.fv,)    
+        $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../vboxefi64.fv                                               $(SOLARIS_VBOXINST_DIR_64)/vboxefi64.fv,)
+        $(QUIET)$(if $(VBOX_WITH_EFIFW_PACKING),$(LN_SYMLINK) -f ../vboxefi64.fv                                               $(SOLARIS_VBOXINST_DIR_32)/vboxefi64.fv,)
 else
         $(QUIET)$(if $(VBOX_WITH_VBOXSDL),$(INSTALL) -m 0644 $(PATH_DEVTOOLS_TRG)/libSDL/v1.2.13/lib/libSDL-1.2.so.0.11.2    $(SOLARIS_VBOXINST_DIR_ISA)/libSDL-1.2.so.0,)