From e8de4716609c2ff3d239a28dabb012b73f52061a Mon Sep 17 00:00:00 2001 From: Mike Beaton Date: Thu, 12 Sep 2024 00:23:52 +0100 Subject: [PATCH] ArmVirtPkg: Include no network components with -D NETWORK_ENABLE=0 This issue showed up when addressing https://bugzilla.tianocore.org/show_bug.cgi?id=4829 in https://github.com/tianocore/edk2/pull/6087 . Various OvmfPkg and ArmVirtPkg platforms include some residual NetworkPkg components when compiled with -D NETWORK_ENABLE=0, even though they use NetworkPkg includes intended to allow all NetworkPkg components to be disabled on this flag. For the OvmfPkg Intel platforms only, commit d933ec115bdf9be1d8dfe6a818414a14973cc0d3 started the change of not including these residual NetworkPkg components, and commit 7f17a155640a2a9e1f7b0f3522628ee2c6f62624 completed it. This commit rolls these changes out to the ArmVirtPkg platforms where they make sense in the same way. Signed-off-by: Mike Beaton --- ArmVirtPkg/ArmVirt.dsc.inc | 6 ++++++ ArmVirtPkg/ArmVirtCloudHv.fdf | 2 ++ ArmVirtPkg/ArmVirtKvmTool.fdf | 2 ++ ArmVirtPkg/ArmVirtQemu.dsc | 2 ++ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 ++ ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 ++ ArmVirtPkg/ArmVirtXen.fdf | 2 ++ 7 files changed, 18 insertions(+) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index 23d2fcf450..5bd4712bd0 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -395,6 +395,7 @@ # MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf +!if $(NETWORK_ENABLE) == TRUE ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -403,6 +404,7 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE } +!endif ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE @@ -423,9 +425,13 @@ NULL|ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf !endif NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf +!if $(NETWORK_ENABLE) == TRUE +!if $(NETWORK_IP4_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf +!endif !if $(NETWORK_IP6_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf +!endif !endif HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.inf PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf index 555604056c..77005c7147 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.fdf +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf @@ -167,8 +167,10 @@ READ_LOCK_STATUS = TRUE # UEFI application (Shell Embedded Boot Loader) # INF ShellPkg/Application/Shell/Shell.inf +!if $(NETWORK_ENABLE) == TRUE INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf +!endif INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf index cdf756c112..ed2804fc54 100644 --- a/ArmVirtPkg/ArmVirtKvmTool.fdf +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf @@ -174,7 +174,9 @@ READ_LOCK_STATUS = TRUE INF OvmfPkg/VirtioRngDxe/VirtioRng.inf INF ShellPkg/Application/Shell/Shell.inf +!if $(NETWORK_ENABLE) == TRUE INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +!endif # # Bds diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 0bd8d85cab..ab8f72d54b 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -498,6 +498,7 @@ # !include NetworkPkg/NetworkComponents.dsc.inc +!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_PXE_BOOT_ENABLE) == TRUE NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { @@ -510,6 +511,7 @@ NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf } +!endif !endif # diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 38906004d7..b97a2c706b 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -102,8 +102,10 @@ READ_LOCK_STATUS = TRUE INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf INF ShellPkg/Application/Shell/Shell.inf +!if $(NETWORK_ENABLE) == TRUE INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf +!endif INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 402d39e40d..b211601491 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -407,6 +407,7 @@ # !include NetworkPkg/NetworkComponents.dsc.inc +!if $(NETWORK_ENABLE) == TRUE !if $(NETWORK_PXE_BOOT_ENABLE) == TRUE NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf { @@ -419,6 +420,7 @@ NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf } +!endif !endif # diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf index ea835551b3..5e15cd070e 100644 --- a/ArmVirtPkg/ArmVirtXen.fdf +++ b/ArmVirtPkg/ArmVirtXen.fdf @@ -178,8 +178,10 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF ShellPkg/Application/Shell/Shell.inf +!if $(NETWORK_ENABLE) == TRUE INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf +!endif INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf