OvmfPkg: move dsc include snippet for Network support to Include/Dsc

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index fcc5722a6b669e9ad38f038070159a5bc94eb8dd..4fe7cb5f1b681b9bec2fd3fd2341d8717e0e726d 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -827,7 +827,7 @@
   # Network Support\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
-!include OvmfPkg/NetworkComponents.dsc.inc\r
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc\r
 \r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r

diff --git a/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc b/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
new file mode 100644 (file)
index 0000000..713eec7
--- /dev/null
+++ b/OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc
@@ -0,0 +1,35 @@
+##\r
+#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
+##\r
+\r
+!if $(NETWORK_ENABLE) == TRUE\r
+  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf\r
+  }\r
+\r
+  !if $(NETWORK_TLS_ENABLE) == TRUE\r
+    NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
+      <LibraryClasses>\r
+        NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r
+    }\r
+  !endif\r
+\r
+  !if $(NETWORK_IP4_ENABLE) == TRUE\r
+    NetworkPkg/Ip4Dxe/Ip4Dxe.inf {\r
+      <LibraryClasses>\r
+        UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf\r
+      <PcdsFixedAtBuild>\r
+        gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv4Support"\r
+    }\r
+  !endif\r
+\r
+  !if $(NETWORK_IP6_ENABLE) == TRUE\r
+    NetworkPkg/Ip6Dxe/Ip6Dxe.inf {\r
+      <LibraryClasses>\r
+        UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf\r
+      <PcdsFixedAtBuild>\r
+        gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv6Support"\r
+    }\r
+  !endif\r
+!endif\r

diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 649005201fcbe6fa217e885b4bdb9c214c7e3cb9..93d4cf3da2551a4120692a303343e288f23a3cb8 100644 (file)
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -817,7 +817,7 @@
   # Network Support\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
-!include OvmfPkg/NetworkComponents.dsc.inc\r
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc\r
 \r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r

diff --git a/OvmfPkg/NetworkComponents.dsc.inc b/OvmfPkg/NetworkComponents.dsc.inc
deleted file mode 100644 (file)
index 713eec7..0000000
--- a/OvmfPkg/NetworkComponents.dsc.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-##\r
-#    SPDX-License-Identifier: BSD-2-Clause-Patent\r
-##\r
-\r
-!if $(NETWORK_ENABLE) == TRUE\r
-  NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {\r
-    <LibraryClasses>\r
-      NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf\r
-  }\r
-\r
-  !if $(NETWORK_TLS_ENABLE) == TRUE\r
-    NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {\r
-      <LibraryClasses>\r
-        NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf\r
-    }\r
-  !endif\r
-\r
-  !if $(NETWORK_IP4_ENABLE) == TRUE\r
-    NetworkPkg/Ip4Dxe/Ip4Dxe.inf {\r
-      <LibraryClasses>\r
-        UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf\r
-      <PcdsFixedAtBuild>\r
-        gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv4Support"\r
-    }\r
-  !endif\r
-\r
-  !if $(NETWORK_IP6_ENABLE) == TRUE\r
-    NetworkPkg/Ip6Dxe/Ip6Dxe.inf {\r
-      <LibraryClasses>\r
-        UefiDriverEntryPoint|OvmfPkg/Library/UefiDriverEntryPointFwCfgOverrideLib/UefiDriverEntryPointFwCfgOverrideLib.inf\r
-      <PcdsFixedAtBuild>\r
-        gUefiOvmfPkgTokenSpaceGuid.PcdEntryPointOverrideFwCfgVarName|"opt/org.tianocore/IPv6Support"\r
-    }\r
-  !endif\r
-!endif\r

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 5a2214a872ed7ed3f9f10a0232a3f7daecf808f9..f8250fa63546b41b02ba0d22a5cad34ecfaf56b7 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -879,7 +879,7 @@
   # Network Support\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
-!include OvmfPkg/NetworkComponents.dsc.inc\r
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc\r
 \r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index bac41d7309c7e034e1e97b5b5a6f313caf191006..aca292ce83cffc8d10384adde8a5a98738302c15 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -893,7 +893,7 @@
   # Network Support\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
-!include OvmfPkg/NetworkComponents.dsc.inc\r
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc\r
 \r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 9b6257a6919ea8725aadd58148b554f88ff7ee0b..3f6465d8d60321c96c72cd25d9705306db36abd7 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -961,7 +961,7 @@
   # Network Support\r
   #\r
 !include NetworkPkg/NetworkComponents.dsc.inc\r
-!include OvmfPkg/NetworkComponents.dsc.inc\r
+!include OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc\r
 \r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
 \r