[edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir

Gerd Hoffmann posted 3 patches 2 months, 1 week ago
Failed in applying to current master (apply log)
There is a newer version of this series
OvmfPkg/{ => inc}/NetworkComponents.dsc.inc      |  0
OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc   |  0
OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc   |  0
OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc         |  0
OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc            |  0
OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc            |  0
OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc         |  0
OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc    |  0
OvmfPkg/AmdSev/AmdSevX64.dsc                     | 14 +++++++-------
OvmfPkg/CloudHv/CloudHvX64.dsc                   | 16 ++++++++--------
OvmfPkg/Microvm/MicrovmX64.dsc                   |  4 ++--
OvmfPkg/OvmfPkgIa32.dsc                          | 16 ++++++++--------
OvmfPkg/OvmfPkgIa32X64.dsc                       | 16 ++++++++--------
OvmfPkg/OvmfPkgX64.dsc                           | 16 ++++++++--------
OvmfPkg/AmdSev/AmdSevX64.fdf                     | 10 +++++-----
OvmfPkg/Bhyve/BhyveX64.fdf                       |  6 +++---
OvmfPkg/CloudHv/CloudHvX64.fdf                   |  6 +++---
OvmfPkg/IntelTdx/IntelTdxX64.fdf                 |  8 ++++----
OvmfPkg/Microvm/MicrovmX64.fdf                   |  6 +++---
OvmfPkg/OvmfPkgIa32.fdf                          | 12 ++++++------
OvmfPkg/OvmfPkgIa32X64.fdf                       | 12 ++++++------
OvmfPkg/OvmfPkgX64.fdf                           | 12 ++++++------
OvmfPkg/OvmfXen.fdf                              |  8 ++++----
OvmfPkg/Include/WorkArea.h                       |  2 +-
OvmfPkg/Sec/AmdSev.h                             |  2 +-
OvmfPkg/Sec/AmdSev.c                             |  2 +-
.../{ => inc}/FvmainCompactScratchEnd.fdf.inc    |  0
OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc         |  0
OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc             |  0
OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc             |  0
OvmfPkg/{ => inc}/VarStore.fdf.inc               |  0
OvmfPkg/{ => inc}/XenElfHeader.fdf.inc           |  0
32 files changed, 84 insertions(+), 84 deletions(-)
rename OvmfPkg/{ => inc}/NetworkComponents.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc (100%)
rename OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc (100%)
rename OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc (100%)
rename OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc (100%)
rename OvmfPkg/{ => inc}/VarStore.fdf.inc (100%)
rename OvmfPkg/{ => inc}/XenElfHeader.fdf.inc (100%)
[edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir
Posted by Gerd Hoffmann 2 months, 1 week ago
We have a number of include files for *.dsc and *.fdf in OvmfPkg/, lets
unclutter the directory a bit by moving them all to a subdirectory.

Gerd Hoffmann (3):
  OvmfPkg: move dsc and fdf include snippets for TPM support to inc
    subdir
  OvmfPkg: move dsc include snippet for Network support to inc subdir
  OvmfPkg: move fdf include snippets to inc subdirectory

 OvmfPkg/{ => inc}/NetworkComponents.dsc.inc      |  0
 OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc   |  0
 OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc   |  0
 OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc         |  0
 OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc            |  0
 OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc            |  0
 OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc         |  0
 OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc    |  0
 OvmfPkg/AmdSev/AmdSevX64.dsc                     | 14 +++++++-------
 OvmfPkg/CloudHv/CloudHvX64.dsc                   | 16 ++++++++--------
 OvmfPkg/Microvm/MicrovmX64.dsc                   |  4 ++--
 OvmfPkg/OvmfPkgIa32.dsc                          | 16 ++++++++--------
 OvmfPkg/OvmfPkgIa32X64.dsc                       | 16 ++++++++--------
 OvmfPkg/OvmfPkgX64.dsc                           | 16 ++++++++--------
 OvmfPkg/AmdSev/AmdSevX64.fdf                     | 10 +++++-----
 OvmfPkg/Bhyve/BhyveX64.fdf                       |  6 +++---
 OvmfPkg/CloudHv/CloudHvX64.fdf                   |  6 +++---
 OvmfPkg/IntelTdx/IntelTdxX64.fdf                 |  8 ++++----
 OvmfPkg/Microvm/MicrovmX64.fdf                   |  6 +++---
 OvmfPkg/OvmfPkgIa32.fdf                          | 12 ++++++------
 OvmfPkg/OvmfPkgIa32X64.fdf                       | 12 ++++++------
 OvmfPkg/OvmfPkgX64.fdf                           | 12 ++++++------
 OvmfPkg/OvmfXen.fdf                              |  8 ++++----
 OvmfPkg/Include/WorkArea.h                       |  2 +-
 OvmfPkg/Sec/AmdSev.h                             |  2 +-
 OvmfPkg/Sec/AmdSev.c                             |  2 +-
 .../{ => inc}/FvmainCompactScratchEnd.fdf.inc    |  0
 OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc         |  0
 OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc             |  0
 OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc             |  0
 OvmfPkg/{ => inc}/VarStore.fdf.inc               |  0
 OvmfPkg/{ => inc}/XenElfHeader.fdf.inc           |  0
 32 files changed, 84 insertions(+), 84 deletions(-)
 rename OvmfPkg/{ => inc}/NetworkComponents.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc (100%)
 rename OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc (100%)
 rename OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc (100%)
 rename OvmfPkg/{ => inc}/VarStore.fdf.inc (100%)
 rename OvmfPkg/{ => inc}/XenElfHeader.fdf.inc (100%)

-- 
2.38.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96896): https://edk2.groups.io/g/devel/message/96896
Mute This Topic: https://groups.io/mt/95405111/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir
Posted by Yao, Jiewen 2 months ago
Hi Gerd
I like the idea to put *.dsc and *.fdf to a subdirectory.

I recommend to follow what we did in MinPlatformPkg.
https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Dsc
https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Fdf

*.dsc -> Include/Dsc
*.fdf-> Include/Fdf

Thank you
Yao, Jiewen

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Friday, December 2, 2022 9:06 PM
> To: devel@edk2.groups.io
> Cc: Anthony Perard <anthony.perard@citrix.com>; Justen, Jordan L
> <jordan.l.justen@intel.com>; Xu, Min M <min.m.xu@intel.com>; Boeuf,
> Sebastien <sebastien.boeuf@intel.com>; Ard Biesheuvel
> <ardb+tianocore@kernel.org>; Rebecca Cran <rebecca@bsdio.com>; Julien
> Grall <julien@xen.org>; James Bottomley <jejb@linux.ibm.com>; Tom
> Lendacky <thomas.lendacky@amd.com>; Aktas, Erdem
> <erdemaktas@google.com>; Gerd Hoffmann <kraxel@redhat.com>; Yao,
> Jiewen <jiewen.yao@intel.com>; Brijesh Singh <brijesh.singh@amd.com>;
> Pawel Polawski <ppolawsk@redhat.com>; Peter Grehan
> <grehan@freebsd.org>; Oliver Steffen <osteffen@redhat.com>
> Subject: [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir
> 
> We have a number of include files for *.dsc and *.fdf in OvmfPkg/, lets
> unclutter the directory a bit by moving them all to a subdirectory.
> 
> Gerd Hoffmann (3):
>   OvmfPkg: move dsc and fdf include snippets for TPM support to inc
>     subdir
>   OvmfPkg: move dsc include snippet for Network support to inc subdir
>   OvmfPkg: move fdf include snippets to inc subdirectory
> 
>  OvmfPkg/{ => inc}/NetworkComponents.dsc.inc      |  0
>  OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc   |  0
>  OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc   |  0
>  OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc         |  0
>  OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc            |  0
>  OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc            |  0
>  OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc         |  0
>  OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc    |  0
>  OvmfPkg/AmdSev/AmdSevX64.dsc                     | 14 +++++++-------
>  OvmfPkg/CloudHv/CloudHvX64.dsc                   | 16 ++++++++--------
>  OvmfPkg/Microvm/MicrovmX64.dsc                   |  4 ++--
>  OvmfPkg/OvmfPkgIa32.dsc                          | 16 ++++++++--------
>  OvmfPkg/OvmfPkgIa32X64.dsc                       | 16 ++++++++--------
>  OvmfPkg/OvmfPkgX64.dsc                           | 16 ++++++++--------
>  OvmfPkg/AmdSev/AmdSevX64.fdf                     | 10 +++++-----
>  OvmfPkg/Bhyve/BhyveX64.fdf                       |  6 +++---
>  OvmfPkg/CloudHv/CloudHvX64.fdf                   |  6 +++---
>  OvmfPkg/IntelTdx/IntelTdxX64.fdf                 |  8 ++++----
>  OvmfPkg/Microvm/MicrovmX64.fdf                   |  6 +++---
>  OvmfPkg/OvmfPkgIa32.fdf                          | 12 ++++++------
>  OvmfPkg/OvmfPkgIa32X64.fdf                       | 12 ++++++------
>  OvmfPkg/OvmfPkgX64.fdf                           | 12 ++++++------
>  OvmfPkg/OvmfXen.fdf                              |  8 ++++----
>  OvmfPkg/Include/WorkArea.h                       |  2 +-
>  OvmfPkg/Sec/AmdSev.h                             |  2 +-
>  OvmfPkg/Sec/AmdSev.c                             |  2 +-
>  .../{ => inc}/FvmainCompactScratchEnd.fdf.inc    |  0
>  OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc         |  0
>  OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc             |  0
>  OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc             |  0
>  OvmfPkg/{ => inc}/VarStore.fdf.inc               |  0
>  OvmfPkg/{ => inc}/XenElfHeader.fdf.inc           |  0
>  32 files changed, 84 insertions(+), 84 deletions(-)
>  rename OvmfPkg/{ => inc}/NetworkComponents.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmComponentsDxe.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmComponentsPei.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmDefines.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmLibs.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmPcds.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmPcdsHii.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmSecurityStub.dsc.inc (100%)
>  rename OvmfPkg/{ => inc}/FvmainCompactScratchEnd.fdf.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfPkgDefines.fdf.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmDxe.fdf.inc (100%)
>  rename OvmfPkg/{ => inc}/OvmfTpmPei.fdf.inc (100%)
>  rename OvmfPkg/{ => inc}/VarStore.fdf.inc (100%)
>  rename OvmfPkg/{ => inc}/XenElfHeader.fdf.inc (100%)
> 
> --
> 2.38.1
> 
> 
> 
> 
> 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97165): https://edk2.groups.io/g/devel/message/97165
Mute This Topic: https://groups.io/mt/95405111/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH 0/3] OvmfPkg: move include files to inc subdir
Posted by Gerd Hoffmann 2 months ago
On Fri, Dec 09, 2022 at 07:10:41AM +0000, Yao, Jiewen wrote:
> Hi Gerd
> I like the idea to put *.dsc and *.fdf to a subdirectory.
> 
> I recommend to follow what we did in MinPlatformPkg.
> https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Dsc
> https://github.com/tianocore/edk2-platforms/tree/master/Platform/Intel/MinPlatformPkg/Include/Fdf
> 
> *.dsc -> Include/Dsc
> *.fdf-> Include/Fdf

Sounds good, v2 sent.

thanks,
  Gerd



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97183): https://edk2.groups.io/g/devel/message/97183
Mute This Topic: https://groups.io/mt/95405111/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-