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

Gerd Hoffmann posted 3 patches 1 year, 4 months ago
Failed in applying to current master (apply log)
.../{ => Include/Dsc}/NetworkComponents.dsc.inc  |  0
.../Dsc}/OvmfTpmComponentsDxe.dsc.inc            |  0
.../Dsc}/OvmfTpmComponentsPei.dsc.inc            |  0
OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc |  0
OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc    |  0
OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc    |  0
OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc |  0
.../Dsc}/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                     |  6 +++---
OvmfPkg/Bhyve/BhyveX64.fdf                       |  6 +++---
OvmfPkg/CloudHv/CloudHvX64.fdf                   |  2 +-
OvmfPkg/IntelTdx/IntelTdxX64.fdf                 |  8 ++++----
OvmfPkg/Microvm/MicrovmX64.fdf                   |  6 +++---
OvmfPkg/OvmfPkgIa32.fdf                          |  8 ++++----
OvmfPkg/OvmfPkgIa32X64.fdf                       |  8 ++++----
OvmfPkg/OvmfPkgX64.fdf                           |  8 ++++----
OvmfPkg/OvmfXen.fdf                              |  8 ++++----
OvmfPkg/Include/WorkArea.h                       |  2 +-
OvmfPkg/Sec/AmdSev.h                             |  2 +-
OvmfPkg/Sec/AmdSev.c                             |  2 +-
.../Fdf}/FvmainCompactScratchEnd.fdf.inc         |  0
OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc |  0
OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc       |  0
OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc   |  0
30 files changed, 74 insertions(+), 74 deletions(-)
rename OvmfPkg/{ => Include/Dsc}/NetworkComponents.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsPei.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc (100%)
rename OvmfPkg/{ => Include/Dsc}/OvmfTpmSecurityStub.dsc.inc (100%)
rename OvmfPkg/{ => Include/Fdf}/FvmainCompactScratchEnd.fdf.inc (100%)
rename OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc (100%)
rename OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc (100%)
rename OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc (100%)
[edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc subdir
Posted by Gerd Hoffmann 1 year, 4 months 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.

v2:
 use Include/{Dsc,Fdf} instead of inc

Gerd Hoffmann (3):
  OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs
  OvmfPkg: move dsc include snippet for Network support to Include/Dsc
  mv OvmfPkg: move fdf include snippets to Include/Fdf

 .../{ => Include/Dsc}/NetworkComponents.dsc.inc  |  0
 .../Dsc}/OvmfTpmComponentsDxe.dsc.inc            |  0
 .../Dsc}/OvmfTpmComponentsPei.dsc.inc            |  0
 OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc |  0
 OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc    |  0
 OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc    |  0
 OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc |  0
 .../Dsc}/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                     |  6 +++---
 OvmfPkg/Bhyve/BhyveX64.fdf                       |  6 +++---
 OvmfPkg/CloudHv/CloudHvX64.fdf                   |  2 +-
 OvmfPkg/IntelTdx/IntelTdxX64.fdf                 |  8 ++++----
 OvmfPkg/Microvm/MicrovmX64.fdf                   |  6 +++---
 OvmfPkg/OvmfPkgIa32.fdf                          |  8 ++++----
 OvmfPkg/OvmfPkgIa32X64.fdf                       |  8 ++++----
 OvmfPkg/OvmfPkgX64.fdf                           |  8 ++++----
 OvmfPkg/OvmfXen.fdf                              |  8 ++++----
 OvmfPkg/Include/WorkArea.h                       |  2 +-
 OvmfPkg/Sec/AmdSev.h                             |  2 +-
 OvmfPkg/Sec/AmdSev.c                             |  2 +-
 .../Fdf}/FvmainCompactScratchEnd.fdf.inc         |  0
 OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc |  0
 OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc       |  0
 OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc   |  0
 30 files changed, 74 insertions(+), 74 deletions(-)
 rename OvmfPkg/{ => Include/Dsc}/NetworkComponents.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsPei.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Dsc}/OvmfTpmSecurityStub.dsc.inc (100%)
 rename OvmfPkg/{ => Include/Fdf}/FvmainCompactScratchEnd.fdf.inc (100%)
 rename OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc (100%)
 rename OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc (100%)
 rename OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc (100%)

-- 
2.38.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#97179): https://edk2.groups.io/g/devel/message/97179
Mute This Topic: https://groups.io/mt/95559456/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v2 0/3] OvmfPkg: move include files to inc subdir
Posted by Yao, Jiewen 1 year, 4 months ago
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>

Merged https://github.com/tianocore/edk2/pull/3743

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Gerd
> Hoffmann
> Sent: Friday, December 9, 2022 9:04 PM
> To: devel@edk2.groups.io
> Cc: Pawel Polawski <ppolawsk@redhat.com>; Oliver Steffen
> <osteffen@redhat.com>; Gerd Hoffmann <kraxel@redhat.com>
> Subject: [edk2-devel] [PATCH v2 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.
> 
> v2:
>  use Include/{Dsc,Fdf} instead of inc
> 
> Gerd Hoffmann (3):
>   OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs
>   OvmfPkg: move dsc include snippet for Network support to Include/Dsc
>   mv OvmfPkg: move fdf include snippets to Include/Fdf
> 
>  .../{ => Include/Dsc}/NetworkComponents.dsc.inc  |  0
>  .../Dsc}/OvmfTpmComponentsDxe.dsc.inc            |  0
>  .../Dsc}/OvmfTpmComponentsPei.dsc.inc            |  0
>  OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc |  0
>  OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc    |  0
>  OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc    |  0
>  OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc |  0
>  .../Dsc}/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                     |  6 +++---
>  OvmfPkg/Bhyve/BhyveX64.fdf                       |  6 +++---
>  OvmfPkg/CloudHv/CloudHvX64.fdf                   |  2 +-
>  OvmfPkg/IntelTdx/IntelTdxX64.fdf                 |  8 ++++----
>  OvmfPkg/Microvm/MicrovmX64.fdf                   |  6 +++---
>  OvmfPkg/OvmfPkgIa32.fdf                          |  8 ++++----
>  OvmfPkg/OvmfPkgIa32X64.fdf                       |  8 ++++----
>  OvmfPkg/OvmfPkgX64.fdf                           |  8 ++++----
>  OvmfPkg/OvmfXen.fdf                              |  8 ++++----
>  OvmfPkg/Include/WorkArea.h                       |  2 +-
>  OvmfPkg/Sec/AmdSev.h                             |  2 +-
>  OvmfPkg/Sec/AmdSev.c                             |  2 +-
>  .../Fdf}/FvmainCompactScratchEnd.fdf.inc         |  0
>  OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc |  0
>  OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc       |  0
>  OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc   |  0
>  30 files changed, 74 insertions(+), 74 deletions(-)
>  rename OvmfPkg/{ => Include/Dsc}/NetworkComponents.dsc.inc (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc
> (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmComponentsPei.dsc.inc
> (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmDefines.dsc.inc (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmLibs.dsc.inc (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcds.dsc.inc (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmPcdsHii.dsc.inc (100%)
>  rename OvmfPkg/{ => Include/Dsc}/OvmfTpmSecurityStub.dsc.inc (100%)
>  rename OvmfPkg/{ => Include/Fdf}/FvmainCompactScratchEnd.fdf.inc
> (100%)
>  rename OvmfPkg/{ => Include/Fdf}/OvmfPkgDefines.fdf.inc (100%)
>  rename OvmfPkg/{ => Include/Fdf}/VarStore.fdf.inc (100%)
>  rename OvmfPkg/{ => Include/Fdf}/XenElfHeader.fdf.inc (100%)
> 
> --
> 2.38.1
> 
> 
> 
> 
> 



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