From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web11.3063.1662465578735115428 for ; Tue, 06 Sep 2022 04:59:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qduugTSV; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 398AE614E4; Tue, 6 Sep 2022 11:59:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B29AC4347C; Tue, 6 Sep 2022 11:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662465578; bh=xB0oraFVcxXT3yNm+yHsIMrAhMrzgWX6Wrm29xLTgvU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qduugTSVFTNc1B4ini+xHOlaZTsQtewxHnrRsmrhoO5ci30P9snSFMIBW3ggzzb2w zksMbIBKcsoInZCpTtCXC/AMpsTqY76T1XXQN8mXkX3uCHEYCR3NR/KK/2QVjGQRr7 CBDC60GMBR7/ZoGQquF01WfeP4oVWfXfBhqGlpZ8othJr3qwH86k6/lm5/Cd5fAAVy kUsHn90mCtAnJ0TyK5A7NHcgMBexieY887DKFCmWU8zYNfAo/lqWveVfwlMFj+8f/P JEkHT114wk0wHpDg6kGEPnuXJOdoE6g+Dh2KkiRUkqR6FkjVKIQmTMOSIB9w5xPpE5 DnJ2S0SpnJxvg== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Yuan Yu , Laszlo Ersek , Gerd Hoffmann , Pawel Polawski , Oliver Steffen , Jiewen Yao , "Brian J . Johnson" Subject: [PATCH v3 2/3] OvmfPkg: gather common NetworkComponents overrides in .dsc.inc file Date: Tue, 6 Sep 2022 13:59:25 +0200 Message-Id: <20220906115926.115493-3-ardb@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220906115926.115493-1-ardb@kernel.org> References: <20220906115926.115493-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable All QEMU based OVMF platforms override the same set of network components, to specify NULL library class resolutions that modify the behavior of those components in a QEMU specific way. Before adding more occurrences of that, let's drop those definitions in a common include file. Signed-off-by: Ard Biesheuvel --- OvmfPkg/CloudHv/CloudHvX64.dsc | 12 +----------- OvmfPkg/Microvm/MicrovmX64.dsc | 12 +----------- OvmfPkg/NetworkComponents.dsc.inc | 17 +++++++++++++++++ OvmfPkg/OvmfPkgIa32.dsc | 12 +----------- OvmfPkg/OvmfPkgIa32X64.dsc | 12 +----------- OvmfPkg/OvmfPkgX64.dsc | 12 +----------- 6 files changed, 22 insertions(+), 55 deletions(-) diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 0f0fc9a1de73..10b16104acd7 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -827,18 +827,8 @@ [Components] # Network Support=0D #=0D !include NetworkPkg/NetworkComponents.dsc.inc=0D +!include OvmfPkg/NetworkComponents.dsc.inc=0D =0D - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf=0D - }=0D -=0D -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE=0D - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf=0D - }=0D -!endif=0D OvmfPkg/VirtioNetDxe/VirtioNet.inf=0D =0D !if $(TOOL_CHAIN_TAG) !=3D "XCODE5"=0D diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 52498bbe90a8..33d68a5493de 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -793,18 +793,8 @@ [Components] # Network Support=0D #=0D !include NetworkPkg/NetworkComponents.dsc.inc=0D +!include OvmfPkg/NetworkComponents.dsc.inc=0D =0D - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf=0D - }=0D -=0D -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE=0D - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf=0D - }=0D -!endif=0D OvmfPkg/VirtioNetDxe/VirtioNet.inf=0D =0D #=0D diff --git a/OvmfPkg/NetworkComponents.dsc.inc b/OvmfPkg/NetworkComponents.= dsc.inc new file mode 100644 index 000000000000..85a165391655 --- /dev/null +++ b/OvmfPkg/NetworkComponents.dsc.inc @@ -0,0 +1,17 @@ +##=0D +# SPDX-License-Identifier: BSD-2-Clause-Patent=0D +##=0D +=0D +!if $(NETWORK_ENABLE) =3D=3D TRUE=0D + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {=0D + =0D + NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf=0D + }=0D +=0D + !if $(NETWORK_TLS_ENABLE) =3D=3D TRUE=0D + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {=0D + =0D + NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf=0D + }=0D + !endif=0D +!endif=0D diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 367ddeb2da5f..55283b19738b 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -879,18 +879,8 @@ [Components] # Network Support=0D #=0D !include NetworkPkg/NetworkComponents.dsc.inc=0D +!include OvmfPkg/NetworkComponents.dsc.inc=0D =0D - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf=0D - }=0D -=0D -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE=0D - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf=0D - }=0D -!endif=0D OvmfPkg/VirtioNetDxe/VirtioNet.inf=0D =0D #=0D diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 37c4c2fadca4..daf08e5fd172 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -893,18 +893,8 @@ [Components.X64] # Network Support=0D #=0D !include NetworkPkg/NetworkComponents.dsc.inc=0D +!include OvmfPkg/NetworkComponents.dsc.inc=0D =0D - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf=0D - }=0D -=0D -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE=0D - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf=0D - }=0D -!endif=0D OvmfPkg/VirtioNetDxe/VirtioNet.inf=0D =0D #=0D diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index bd1a104608ca..f3fe4babbff1 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -961,18 +961,8 @@ [Components] # Network Support=0D #=0D !include NetworkPkg/NetworkComponents.dsc.inc=0D +!include OvmfPkg/NetworkComponents.dsc.inc=0D =0D - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/PxeBcPcdProducerLib/PxeBcPcdProducerLib.inf=0D - }=0D -=0D -!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE=0D - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf {=0D - =0D - NULL|OvmfPkg/Library/TlsAuthConfigLib/TlsAuthConfigLib.inf=0D - }=0D -!endif=0D OvmfPkg/VirtioNetDxe/VirtioNet.inf=0D =0D #=0D --=20 2.35.1