[edk2-devel][RFC PATCH] OvmfPkg/Include: Remove NETWORK_ENABLE check in ShellComponents.dsc.inc

[edk2-devel][RFC PATCH] OvmfPkg/Include: Remove NETWORK_ENABLE check in ShellComponents.dsc.inc

[Richard Lyu via groups.io]

I tried to fix the build error that occurred after commit 7f17a155640a. I have found that
even when NETWORK_ENABLE=0, VirtioNet.inf is still being included. This causes errors by
including network-related modules, but I’m not sure if there are other reasons. Does anyone
have any ideas or suggestions on how to resolve this issue? Otherwise, the only solution
would be to use this patch to remove the NETWORK_ENABLE check.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4829

The `NETWORK_ENABLE` condition in `ShellComponents.dsc.inc` causes
build errors. This change removes the check, ensuring `TftpDynamicCommand`
and `VariablePolicyDynamicCommand` are always included in the build.

Signed-off-by: Richard Lyu <richard.lyu@suse.com>
---
 OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
index 4075688e41..8e4385282e 100644
--- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
+++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
@@ -5,7 +5,6 @@
 !if $(BUILD_SHELL) == TRUE
 
 !if $(TOOL_CHAIN_TAG) != "XCODE5"
-!if $(NETWORK_ENABLE) == TRUE
   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
@@ -14,7 +13,6 @@
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
   }
-!endif
   ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf {
     <PcdsFixedAtBuild>
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120538): https://edk2.groups.io/g/devel/message/120538
Mute This Topic: https://groups.io/mt/108361994/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] [RFC PATCH] OvmfPkg/Include: Remove NETWORK_ENABLE check in ShellComponents.dsc.inc

[Richard Lyu via groups.io]

I tried to fix the build error that occurred after commit 7f17a155640a. I have found that 
even when NETWORK_ENABLE=0, VirtioNet.inf is still being included. This causes errors by 
including network-related modules, but I’m not sure if there are other reasons. Does anyone 
have any ideas or suggestions on how to resolve this issue? Otherwise, the only solution 
would be to use this patch to remove the NETWORK_ENABLE check.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4829

The `NETWORK_ENABLE` condition in `ShellComponents.dsc.inc` causes
build errors. This change removes the check, ensuring `TftpDynamicCommand`
and `VariablePolicyDynamicCommand` are always included in the build.

Signed-off-by: Richard Lyu <richard.lyu@suse.com>
---
 OvmfPkg/Include/Dsc/ShellComponents.dsc.inc | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
index 4075688e41..8e4385282e 100644
--- a/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
+++ b/OvmfPkg/Include/Dsc/ShellComponents.dsc.inc
@@ -5,7 +5,6 @@
 !if $(BUILD_SHELL) == TRUE

 

 !if $(TOOL_CHAIN_TAG) != "XCODE5"

-!if $(NETWORK_ENABLE) == TRUE

   ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {

     <PcdsFixedAtBuild>

       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

@@ -14,7 +13,6 @@
     <PcdsFixedAtBuild>

       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

   }

-!endif

   ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf {

     <PcdsFixedAtBuild>

       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

-- 
2.43.0



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#120533): https://edk2.groups.io/g/devel/message/120533
Mute This Topic: https://groups.io/mt/108361994/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-