mirrors/linuxboot
1
0
Fork 0
mirror of https://github.com/linuxboot/linuxboot synced 2024-11-21 07:42:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure DxeCore isn't included twice in non-UTK builds

Browse Source 
Signed-off-by: Devon Bautista <devonb@lanl.gov>
This commit is contained in:
Devon Bautista 2021-10-30 19:51:19 +00:00
parent d07e8befc8
commit c6f510b429
No known key found for this signature in database
GPG Key ID: E1AAD3D4444A3DA0
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -142,10 +142,16 @@ else
DXE_FFS += dxe/linuxboot.ffs
DXE_FFS += $(BUILD)/Linux.ffs
DXE_FFS += $(BUILD)/Initrd.ffs
# The Perl way of building replaces DxeCore with a custom version but
# UTK needs the original DxeCore, so uncomment DxeCore in image-files.txt
# on-the-fly before passing it to UTK.
$(BUILD)/linuxboot.rom: bin/utk $(DXE_FFS)
$< \
$(ROM) \
remove_dxes_except boards/$(BOARD)/image-files.txt \
remove_dxes_except \
<(sed 's|^#[[:space:]]\+\(d6a2cb7f-6a18-4e2f-b43b-9920a733700a\)[[:space:]]\+\(DxeCore\)|\1 \2|' \
boards/$(BOARD)/image-files.txt) \
$(foreach ffs,$(DXE_FFS), insert_dxe $(ffs)) \
$(UTK_EXTRA_OPS) \
save $@

2
boards/qemu/image-files.txt
View File

@ -1,5 +1,5 @@
fc510ee7-ffdc-11d4-bd41-0080c73c8881 DXE Apriori
d6a2cb7f-6a18-4e2f-b43b-9920a733700a DxeCore
# d6a2cb7f-6a18-4e2f-b43b-9920a733700a DxeCore
d93ce3d8-a7eb-4730-8c8e-cc466a9ecc3c ReportStatusCodeRouterRuntimeDxe
6c2004ef-4e0e-4be4-b14c-340eb4aa5891 StatusCodeHandlerRuntimeDxe
80cf7257-87ab-47f9-a3fe-d50b76d89541 PcdDxe