VirtualBox

Changeset 107145 in vbox


Ignore:
Timestamp:
Nov 26, 2024 10:33:37 AM (3 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
166127
Message:

/Makefile.kmk,EFI/Firmware/Makefile.kmk: Got rid of the legacy VBoxEFI*.fd names and armv8-only zip. jiraref:VBP-1458

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.kmk

    r107142 r107145  
    493493        $(SHELL) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
    494494        $(MV) -f -- "[email protected]" "$@"
    495 
    496    if 0 #def VBOX_WITH_VIRT_ARMV8
    497     #
    498     # The ARMv8 EFI images
    499     #
    500     INSTALLS += buildserver-efifw-armv8
    501     buildserver-efifw-armv8_INST = $(INST_BIN)
    502     buildserver-efifw-armv8_MODE = 0644
    503     buildserver-efifw-armv8_SOURCES = \
    504         $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch32.fd \
    505         $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch64.fd
    506     buildserver-efifw-armv8_CLEANS = \
    507         $(buildserver-efifw-armv8_0_OUTDIR)/unpacked.ts \
    508         $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch32.fd \
    509         $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch64.fd \
    510         $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEfiFirmware-armv8.zip \
    511         $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEfiFirmware-armv8.zip.tmp \
    512         $(foreach arch, aarch64 aarch32, $(foreach mod,$(VBOX_EFI_MODULES_FLAT_ARM),$$(buildserver-efifw-armv8_0_OUTDIR)/$(arch)/$(mod).pdb))
    513 
    514     INSTALLS += buildserver-efifw-dbg-aarch64
    515     buildserver-efifw-dbg-aarch64_INST = $(INST_VBOXDBG_SYMS)aarch64/
    516     buildserver-efifw-dbg-aarch64_MODE = 0644
    517     buildserver-efifw-dbg-aarch64_SOURCES = \
    518         $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),$(buildserver-efifw-armv8_0_OUTDIR)/arm64/$(mod).debug)
    519 
    520     INSTALLS += buildserver-efifw-dbg-aarch32
    521     buildserver-efifw-dbg-aarch32_INST = $(INST_VBOXDBG_SYMS)aarch32/
    522     buildserver-efifw-dbg-aarch32_MODE = 0644
    523     buildserver-efifw-dbg-aarch32_SOURCES = \
    524         $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm32),$(buildserver-efifw-armv8_0_OUTDIR)/arm32/$(mod).debug)
    525 
    526     $$(buildserver-efifw-armv8_0_OUTDIR)/unpacked.ts \
    527     +| $$(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch32.fd \
    528     $$(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch64.fd \
    529     $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm32),$$(buildserver-efifw-armv8_0_OUTDIR)/arm32/$(mod).debug) \
    530     $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),$$(buildserver-efifw-armv8_0_OUTDIR)/arm64/$(mod).debug): \
    531                 $$(buildserver-efifw-armv8_0_OUTDIR)/VBoxEfiFirmware-armv8.zip
    532         $(call MSG_L1,Unpacking EFI ARMv8 firmware)
    533         $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(buildserver-efifw-armv8_0_OUTDIR)
    534         $(MKDIR) -p -- $(dir $@)/arm32 $(dir $@)/arm64
    535         $(foreach file, \
    536                 $(foreach arch, arm32 arm64, $(foreach mod, $(VBOX_EFI_MODULES_FLAT.$(arch)), $(buildserver-efifw-armv8_0_OUTDIR)/$(arch)/$(mod).debug)) \
    537                 ,$(NLTAB) $(QUIET)$(TEST) '!' -f $(file) -- $(TOUCH_EXT) $(file) )
    538         $(TOUCH) -c -- \
    539                 $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch32.fd \
    540                 $(buildserver-efifw-armv8_0_OUTDIR)/VBoxEFIAArch64.fd
    541         $(APPEND) -t $@ "done"
    542 
    543     $$(buildserver-efifw-armv8_0_OUTDIR)/VBoxEfiFirmware-armv8.zip: \
    544                 $(VBOX_SVN_REV_KMK) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh | $$(dir $$@)
    545         $(RM) -f -- "$@" "[email protected]"
    546         $(SHELL) $(KBUILD_DEVTOOLS)/bin/efi_firmware.sh --cmd fetch-armv8 --filename "[email protected]" $(if $(VBOX_USE_PROXY_FOR_BUILD_SERVER),--default-proxy,)
    547         $(MV) -f -- "[email protected]" "$@"
    548    endif
    549495
    550496  else # !VBOX_WITH_EFIFW_FROM_BUILD_SERVER

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

    r107069 r107145  
    117117VBoxEfiFirmware_MODE = 0644
    118118VBoxEfiFirmware_SOURCES = \
    119         $(VBoxEfiFirmware_0_OUTDIR)/x86/$(call VBOX_EFI_OUTPUT_SUBDIR,x86)/FV/OVMF.fd=>VBoxEFI32.fd \
    120119        $(VBoxEfiFirmware_0_OUTDIR)/x86/$(call VBOX_EFI_OUTPUT_SUBDIR,x86)/FV/OVMF.fd=>VBoxEFI-x86.fd \
    121         $(VBoxEfiFirmware_0_OUTDIR)/amd64/$(call VBOX_EFI_OUTPUT_SUBDIR,amd64)/FV/OVMF.fd=>VBoxEFI64.fd \
    122120        $(VBoxEfiFirmware_0_OUTDIR)/amd64/$(call VBOX_EFI_OUTPUT_SUBDIR,amd64)/FV/OVMF.fd=>VBoxEFI-amd64.fd \
    123121        $(VBoxEfiFirmware_0_OUTDIR)/arm32/$(call VBOX_EFI_OUTPUT_SUBDIR,arm32)/FV/QEMU_EFI.fd=>VBoxEFI-arm32.fd \
    124         $(VBoxEfiFirmware_0_OUTDIR)/arm32/$(call VBOX_EFI_OUTPUT_SUBDIR,arm32)/FV/QEMU_EFI.fd=>VBoxEFIAArch32.fd \
    125         $(VBoxEfiFirmware_0_OUTDIR)/arm64/$(call VBOX_EFI_OUTPUT_SUBDIR,arm64)/FV/QEMU_EFI.fd=>VBoxEFI-arm64.fd \
    126         $(VBoxEfiFirmware_0_OUTDIR)/arm64/$(call VBOX_EFI_OUTPUT_SUBDIR,arm64)/FV/QEMU_EFI.fd=>VBoxEFIAArch64.fd
     122        $(VBoxEfiFirmware_0_OUTDIR)/arm64/$(call VBOX_EFI_OUTPUT_SUBDIR,arm64)/FV/QEMU_EFI.fd=>VBoxEFI-arm64.fd
    127123VBoxEfiFirmware_BLDDIRS = \
    128124        $(VBoxEfiFirmware_0_OUTDIR)/x86/ \
    … …  
    217213VBoxEfiFirmware.zip: $(PATH_STAGE)/VBoxEfiFirmware.zip
    218214$(PATH_STAGE)/VBoxEfiFirmware.zip: # $(MAKEFILE) make this problematic \
    219                 $(PATH_STAGE_BIN)/VBoxEFI32.fd \
    220                 $(PATH_STAGE_BIN)/VBoxEFI64.fd \
     215                $(PATH_STAGE_BIN)/VBoxEFI-x86.fd \
     216                $(PATH_STAGE_BIN)/VBoxEFI-amd64.fd \
     217                $(PATH_STAGE_BIN)/VBoxEFI-arm32.fd \
     218                $(PATH_STAGE_BIN)/VBoxEFI-arm64.fd \
     219                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.x86)  ,$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)/x86/$(mod)$(VBOX_EFI_DBG_SUFF.x86)) \
    221220                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.amd64),$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)/amd64/$(mod)$(VBOX_EFI_DBG_SUFF.amd64)) \
    222                 $(foreach mod,$(VBOX_EFI_MODULES_FLAT.x86)  ,$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)/x86/$(mod)$(VBOX_EFI_DBG_SUFF.x86)) \
    223                 $(if-expr "$(KBUILD_HOST)" != "linux", \
    224                         $(PATH_STAGE_BIN)/VBoxEFI-arm32.fd \
    225                         $(PATH_STAGE_BIN)/VBoxEFI-arm64.fd, \
    226                         $(PATH_STAGE_BIN)/VBoxEFIAArch32.fd \
    227                         $(PATH_STAGE_BIN)/VBoxEFIAArch64.fd) \
    228221                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm32),$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)/arm32/$(mod)$(VBOX_EFI_DBG_SUFF.arm32)) \
    229                 $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)/arm64/$(mod)$(VBOX_EFI_DBG_SUFF.arm64)),)
     222                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)/arm64/$(mod)$(VBOX_EFI_DBG_SUFF.arm64))
    230223        $(REDIRECT) -C "$(PATH_STAGE_BIN)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
    231224                VBoxEFI-x86.fd \
    232225                VBoxEFI-amd64.fd \
    233226                VBoxEFI-arm32.fd \
    234                 VBoxEFI-arm64.fd \
    235                 VBoxEFI32.fd \
    236                 VBoxEFI64.fd \
    237                 $(if-expr "$(KBUILD_HOST)" == "linux",\
    238                         VBoxEFIAArch32.fd \
    239                         VBoxEFIAArch64.fd,)
     227                VBoxEFI-arm64.fd
    240228        $(REDIRECT) -C "$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
    241229                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.x86)  ,x86/$(mod)$(VBOX_EFI_DBG_SUFF.x86)) \
    … …  
    244232                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),arm64/$(mod)$(VBOX_EFI_DBG_SUFF.arm64))
    245233
    246 
    247 if defined(VBOX_WITH_VIRT_ARMV8) && "$(KBUILD_HOST)" == "linux"
    248  VBoxEfiFirmware-armv8.zip: $(PATH_STAGE)/VBoxEfiFirmware-armv8.zip
    249  $(PATH_STAGE)/VBoxEfiFirmware-armv8.zip:
    250         $(REDIRECT) -C "$(PATH_STAGE_BIN)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
    251                 VBoxEFIAArch32.fd \
    252                 VBoxEFIAArch64.fd
    253         $(REDIRECT) -C "$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
    254                 $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),arm64/$(mod)$(VBOX_EFI_DBG_SUFF.arm64)) \
    255                 $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm32),arm32/$(mod)$(VBOX_EFI_DBG_SUFF.arm32))
    256 endif
    257234
    258235#
    … …  
    411388
    412389#
    413 # VBoxEFI32
     390# VBoxEFI-x86
    414391#
    415392$(VBoxEfiFirmware_0_OUTDIR)/x86/Conf/target.txt: $(MAKEFILE) | $$(dir $$@) $(VBOX_EFI_BLDPROGS)
    … …  
    443420
    444421#
    445 # VBoxEFI64
     422# VBoxEFI-amd64
    446423#
    447424$(VBoxEfiFirmware_0_OUTDIR)/amd64/Conf/target.txt: $(MAKEFILE) | $$(dir $$@) $(VBOX_EFI_BLDPROGS)
    … …  
    475452
    476453#
    477 # VBoxEFIAArch32
     454# VBoxEFI-arm32
    478455#
    479456$(VBoxEfiFirmware_0_OUTDIR)/arm32/Conf/target.txt: $(MAKEFILE) | $$(dir $$@) $(VBOX_EFI_BLDPROGS)
    … …  
    506483
    507484#
    508 # VBoxEFIAArch64
     485# VBoxEFI-arm64
    509486#
    510487$(VBoxEfiFirmware_0_OUTDIR)/arm64/Conf/target.txt: $(MAKEFILE) | $$(dir $$@) $(VBOX_EFI_BLDPROGS)
    … …  
    540517# Some aliases.
    541518#
    542 build-efi-x86: $$(filter   %VBoxEFI32.fd      %VBoxEFI-x86.fd  ,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
    543 build-efi-amd64: $$(filter %VBoxEFI64.fd      %VBoxEFI-amd64.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
    544 build-efi-arm32: $$(filter %VBoxEFIAArch32.fd %VBoxEFI-arm32.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
    545 build-efi-arm64: $$(filter %VBoxEFIAArch64.fd %VBoxEFI-arm64.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
    546 
     519build-efi-x86: $$(filter   %VBoxEFI-x86.fd  ,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
     520build-efi-amd64: $$(filter %VBoxEFI-amd64.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
     521build-efi-arm32: $$(filter %VBoxEFI-arm32.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
     522build-efi-arm64: $$(filter %VBoxEFI-arm64.fd,$$(VBoxEfiFirmware_2_STAGE_TARGETS))
     523
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette