Changeset 58528 in vbox

Timestamp:

Oct 30, 2015 12:38:59 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

103851

Message:

/Makefile,EFI/Firmware/*.kmk: Do the zipping in the Firmware makefile instead of the root one, and ship the debug info.

Location:

trunk

Files:

• Makefile.kmk (modified) (5 diffs)
• src/VBox/Devices/EFI/Firmware/Config.kmk (modified) (1 diff)
• src/VBox/Devices/EFI/Firmware/Makefile.kmk (modified) (1 diff)

trunk/Makefile.kmk

@@ -302 +302 @@
    # Either from the build server.
    #
+   ifndef VBOX_EFI_FIRMWARE_CONFIG_KMK_INCLUDED
+    include $(PATH_ROOT)/src/VBox/Devices/EFI/Firmware/Config.kmk # For VBOX_EFI_MODULES_FLAT.
+   endif
    INSTALLS += buildserver-efifw
    buildserver-efifw_INST = $(INST_BIN)
@@ -312 +315 @@
         $(buildserver-efifw_0_OUTDIR)/VBoxEFI32.fd \
         $(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd \
-        $(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
+        $(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp \
+        $(foreach arch, amd64 x86, $(foreach mod,$(VBOX_EFI_MODULES_FLAT),$$(buildserver-efifw_0_OUTDIR)/$(arch)/$(mod).pdb))
+
+   INSTALLS += buildserver-efifw-dbg-amd64
+   buildserver-efifw-dbg-amd64_INST = $(INST_VBOXDBG_SYMS)amd64/
+   buildserver-efifw-dbg-amd64_MODE = 0644
+   buildserver-efifw-dbg-amd64_SOURCES = \
+        $(foreach mod,$(VBOX_EFI_MODULES_FLAT),$(buildserver-efifw_0_OUTDIR)/amd64/$(mod).pdb)
+
+   INSTALLS += buildserver-efifw-dbg-x86
+   buildserver-efifw-dbg-x86_INST = $(INST_VBOXDBG_SYMS)x86/
+   buildserver-efifw-dbg-x86_MODE = 0644
+   buildserver-efifw-dbg-x86_SOURCES = \
+        $(foreach mod,$(VBOX_EFI_MODULES_FLAT),$(buildserver-efifw_0_OUTDIR)/x86/$(mod).pdb)
 
    $$(buildserver-efifw_0_OUTDIR)/unpacked.ts \
    +| $$(buildserver-efifw_0_OUTDIR)/VBoxEFI32.fd \
-      $$(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd: \
+      $$(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd \
+      $(foreach arch, amd64 x86, $(foreach mod,$(VBOX_EFI_MODULES_FLAT),$$(buildserver-efifw_0_OUTDIR)/$(arch)/$(mod).pdb)): \
                 $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip
         $(call MSG_L1,Unpacking EFI firmware)
         $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(buildserver-efifw_0_OUTDIR)
-        $(TEST_EXT) -f "$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd"   -- $(MV_EXT) -f -- "$(buildserver-efifw_0_OUTDIR)/FV/VBOX.fd"   "$(buildserver-efifw_0_OUTDIR)/VBoxEFI32.fd"
-        $(TEST_EXT) -f "$(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd" -- $(MV_EXT) -f -- "$(buildserver-efifw_0_OUTDIR)/FV/VBOX64.fd" "$(buildserver-efifw_0_OUTDIR)/VBoxEFI64.fd"
+        $(foreach arch, amd64 x86, \
+                $(NLTAB) $(TEST) '!' -d $(dir $@)/$(arch) -- $(MKDIR_EXT) -- $(dir $@)/$(arch) \
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT) \
+                ,$(NLTAB) $(TEST) '!' -f $(dir $@)/$(arch)/$(mod).pdb -- $(APPEND_EXT) $(dir $@)/$(arch)/$(mod).pdb ))
         $(APPEND) -t $@ "done"
 
    $$(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip: \
                 $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
-        $(RM) -f $@ [email protected]
+        $(RM) -f -- "$@" "[email protected]"
    ifneq ($(KBUILD_HOST),win)
         $(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename [email protected]
@@ -335 +352 @@
         $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-efifw-affinity-hack
    endif
-        $(CP) -f [email protected] $@
-        $(RM) -f [email protected]
-## @todo kBuild: The $(CP)/$(RM) stuff can be replaced by a simple $(TOUCH) once that has been added to kBuild.
+        $(MV) -f -- "[email protected]" "$@"
 
    ifeq ($(KBUILD_HOST),win)
@@ -343 +358 @@
         $(SHELL) $(PATH_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename $(buildserver-efifw_0_OUTDIR)/VBoxEfiFirmware.zip.tmp
    endif
+
   else # !VBOX_WITH_EFIFW_FROM_BUILD_SERVER
    #
-   # Or from the local copy
+   # Or from the local copy (no debug).
    #
    INSTALLS += local-efifw
@@ -1631 +1647 @@
 
 efi-packing:
-        $(REDIRECT) -C "$(PATH_STAGE_BIN)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X \
-                ../VBoxEfiFirmware.zip \
-                VBoxEFI32.fd \
-                VBoxEFI64.fd
-## @todo zip up debug info as well!
+        + $(KMK) -C src/VBox/Devices/EFI/Firmware$(VBOX_EFI_FIRMWARE_SUFFIX) $(PATH_STAGE)/VBoxEfiFirmware.zip
+
 
 #

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -193 +193 @@
 VBOX_EFI_MODULES_FLAT = $(notdir $(value VBOX_EFI_MODULES))
 
+if1of ($(KBUILD_TARGET), win)
+ VBOX_EFI_DBG_SUFF := .pdb
+else
+ VBOX_EFI_DBG_SUFF := .debug
+endif
+

trunk/src/VBox/Devices/EFI/Firmware/Makefile.kmk

@@ -180 +180 @@
 VBoxEfiResetVector-amd64_SOURCES  = OvmfPkg/ResetVector/ResetVectorCode.asm
 
+
+#
+# The zipfile.
+#
+include $(KBUILD_PATH)/tools/ZIP.kmk
+ifndef TOOL_ZIP_PACK
+ TOOL_ZIP_PACK = zip
+endif
+VBoxEfiFirmware.zip: $(PATH_STAGE)/VBoxEfiFirmware.zip
+$(PATH_STAGE)/VBoxEfiFirmware.zip:
+        $(REDIRECT) -C "$(PATH_STAGE_BIN)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
+                VBoxEFI32.fd \
+                VBoxEFI64.fd
+        $(REDIRECT) -C "$(PATH_STAGE)$(INST_VBOXDBG_SYMS)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT),amd64/$(mod)$(VBOX_EFI_DBG_SUFF)) \
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT),x86/$(mod)$(VBOX_EFI_DBG_SUFF))
 
 #