> -----Original Message----- > From: Laszlo Ersek [mailto:ler...@redhat.com] > Sent: Thursday, April 04, 2019 10:21 PM > To: devel@edk2.groups.io; Bi, Dandan <dandan...@intel.com> > Cc: Gao, Liming <liming....@intel.com>; Wang, Jian J > <jian.j.w...@intel.com>; Wu, Hao A <hao.a...@intel.com> > Subject: Re: [edk2-devel] [patch 4/7] MdeModulePkg: Move > BaseUefiTianoCustomDecompressLib to > > On 04/04/19 15:52, Dandan Bi wrote: > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1683 > > > > We will remove IntelFrameworkModulePkg, but > > BaseUefiTianoCustomDecompressLib may still need to be used. So move > > BaseUefiTianoCustomDecompressLib from IntelFrameworkModulePkg to > > MdeModulePkg. > > > > Cc: Liming Gao <liming....@intel.com> > > Cc: Jian J Wang <jian.j.w...@intel.com> > > Cc: Hao Wu <hao.a...@intel.com> > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Dandan Bi <dandan...@intel.com> > > --- > > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec | 4 ---- > > IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 1 - > > .../Include/Guid/TianoDecompress.h | 0 > > .../BaseUefiTianoCustomDecompressLib.c | 0 > > .../BaseUefiTianoCustomDecompressLib.inf | 2 +- > > .../BaseUefiTianoCustomDecompressLibInternals.h | 0 > > .../BaseUefiTianoDecompressLib.uni | 0 > > MdeModulePkg/MdeModulePkg.dec | 4 ++++ > > MdeModulePkg/MdeModulePkg.dsc | 1 + > > 9 files changed, 6 insertions(+), 6 deletions(-) rename > > {IntelFrameworkModulePkg => > > MdeModulePkg}/Include/Guid/TianoDecompress.h (100%) rename > > {IntelFrameworkModulePkg => > > > MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia > noCu > > stomDecompressLib.c (100%) rename {IntelFrameworkModulePkg => > > > MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia > noCu > > stomDecompressLib.inf (94%) rename {IntelFrameworkModulePkg => > > > MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia > noCu > > stomDecompressLibInternals.h (100%) rename > {IntelFrameworkModulePkg > > => > > > MdeModulePkg}/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTia > noDe > > compressLib.uni (100%) > > > > diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > > b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > > index 5557b5a1cd..0a451dd9ee 100644 > > --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > > +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > > @@ -40,14 +40,10 @@ > > > > ## GUID identifies Data Hub records logged by Status Code Runtime > Protocol. > > # Include/Guid/DataHubStatusCodeRecord.h > > gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { > > 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }} > > > > - ## GUID indicates the tiano custom compress/decompress algorithm. > > - # Include/Guid/TianoDecompress.h > > - gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6, > { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }} > > - > > ## Include/Guid/AcpiVariable.h > > gEfiAcpiVariableCompatiblityGuid = { 0xc020489e, 0x6db2, 0x4ef2, > { 0x9a, 0xa5, 0xca, 0x6, 0xfc, 0x11, 0xd3, 0x6a }} > > > > ## Include/Guid/LegacyBios.h > > gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, { > > 0x97, > 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }} > > diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > > b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > > index 949a181a7b..2afda5df79 100644 > > --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > > +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc > > @@ -117,11 +117,10 @@ > > gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f > > gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06 > > gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000 > > > > [Components] > > - > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/B > aseUefiTianoCustomDecompressLib.inf > > > IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCusto > mDecompressLib.inf > > IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > > IntelFrameworkModulePkg/Library/PeiRecoveryLib/PeiRecoveryLib.inf > > > IntelFrameworkModulePkg/Library/DxeReportStatusCodeLibFramework/Dx > eReportStatusCodeLib.inf > > > > > IntelFrameworkModulePkg/Library/SmmRuntimeDxeReportStatusCodeLibF > ramew > > ork/SmmRuntimeDxeReportStatusCodeLibFramework.inf > > diff --git a/IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h > > b/MdeModulePkg/Include/Guid/TianoDecompress.h > > similarity index 100% > > rename from > IntelFrameworkModulePkg/Include/Guid/TianoDecompress.h > > rename to MdeModulePkg/Include/Guid/TianoDecompress.h > > diff --git > > > a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib > /Bas > > eUefiTianoCustomDecompressLib.c > > > b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTi > anoC > > ustomDecompressLib.c > > similarity index 100% > > rename from > > > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/B > aseU > > efiTianoCustomDecompressLib.c rename to > > > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian > oCus > > tomDecompressLib.c diff --git > > > a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib > /Bas > > eUefiTianoCustomDecompressLib.inf > > > b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTi > anoC > > ustomDecompressLib.inf > > similarity index 94% > > rename from > > > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/B > aseU > > efiTianoCustomDecompressLib.inf rename to > > > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian > oCus > > tomDecompressLib.inf > > index ee64fa0d0e..41cc48cd24 100644 > > --- > > > a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib > /Bas > > eUefiTianoCustomDecompressLib.inf > > +++ > b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTi > > +++ anoCustomDecompressLib.inf > > @@ -33,11 +33,11 @@ > > BaseUefiTianoCustomDecompressLibInternals.h > > BaseUefiTianoCustomDecompressLib.c > > > > [Packages] > > MdePkg/MdePkg.dec > > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > > + MdeModulePkg/MdeModulePkg.dec > > > > [LibraryClasses] > > BaseLib > > DebugLib > > BaseMemoryLib > > diff --git > > > a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib > /Bas > > eUefiTianoCustomDecompressLibInternals.h > > > b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTi > anoC > > ustomDecompressLibInternals.h > > similarity index 100% > > rename from > > > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/B > aseU > > efiTianoCustomDecompressLibInternals.h > > rename to > > > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian > oCus > > tomDecompressLibInternals.h diff --git > > > a/IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib > /Bas > > eUefiTianoDecompressLib.uni > > > b/MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTi > anoD > > ecompressLib.uni > > similarity index 100% > > rename from > > > IntelFrameworkModulePkg/Library/BaseUefiTianoCustomDecompressLib/B > aseU > > efiTianoDecompressLib.uni rename to > > > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian > oDec > > ompressLib.uni diff --git a/MdeModulePkg/MdeModulePkg.dec > > b/MdeModulePkg/MdeModulePkg.dec index 9bbd0572f5..546ec38b9d > 100644 > > --- a/MdeModulePkg/MdeModulePkg.dec > > +++ b/MdeModulePkg/MdeModulePkg.dec > > @@ -377,10 +377,14 @@ > > ## GUID indicates the LZMA custom compress/decompress algorithm. > > # Include/Guid/LzmaDecompress.h > > gLzmaCustomDecompressGuid = { 0xEE4E5898, 0x3914, 0x4259, > { 0x9D, 0x6E, 0xDC, 0x7B, 0xD7, 0x94, 0x03, 0xCF }} > > gLzmaF86CustomDecompressGuid = { 0xD42AE6BD, 0x1352, 0x4bfb, > { 0x90, 0x9A, 0xCA, 0x72, 0xA6, 0xEA, 0xE8, 0x89 }} > > > > + ## GUID indicates the tiano custom compress/decompress algorithm. > > + # Include/Guid/TianoDecompress.h > > + gTianoCustomDecompressGuid = { 0xA31280AD, 0x481E, 0x41B6, > { 0x95, 0xE8, 0x12, 0x7F, 0x4C, 0x98, 0x47, 0x79 }} > > + > > ## Include/Guid/TtyTerm.h > > gEfiTtyTermGuid = { 0x7d916d80, 0x5bb1, 0x458c, {0xa4, > > 0x8f, > 0xe2, 0x5f, 0xdd, 0x51, 0xef, 0x94 }} > > > > ## Include/Guid/HiiBootMaintenanceFormset.h > > gEfiIfrBootMaintenanceGuid = { 0xb2dedc91, 0xd59f, 0x48d2, { 0x89, > 0x8a, 0x12, 0x49, 0xc, 0x74, 0xa4, 0xe0 }} > > diff --git a/MdeModulePkg/MdeModulePkg.dsc > > b/MdeModulePkg/MdeModulePkg.dsc index da2078b8d2..8905ca5814 > 100644 > > --- a/MdeModulePkg/MdeModulePkg.dsc > > +++ b/MdeModulePkg/MdeModulePkg.dsc > > @@ -317,10 +317,11 @@ > > MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf > > > MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscove > rableDeviceRegistrationLib.inf > > MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf > > > MdeModulePkg/Library/DisplayUpdateProgressLibGraphics/DisplayUpdate > ProgressLibGraphics.inf > > > > > MdeModulePkg/Library/DisplayUpdateProgressLibText/DisplayUpdateProgr > es > > sLibText.inf > > + > > + > MdeModulePkg/Library/BaseUefiTianoCustomDecompressLib/BaseUefiTian > oC > > + ustomDecompressLib.inf > > > > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > > > MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuA > pp.inf > > MdeModulePkg/Application/UiApp/UiApp.inf{ > > <LibraryClasses> > > > > I think that, if you do a rename like this, then the packages in the rest of > the > series will break, temporarily. If the maintainers of Nt32Pkg, Quark, and > Vlv2 are OK with that, I don't mind, but normally you'd create a copy first, > then update the references to the copy, then remove the original.
Yeah, you are right, it will break temporarily. And we also thought the solution to copy one firstly and then remove the original one , but this may loss the historical commit log. So we choose this sample rename solution to keep the history commit log. Since it will not break build with whole patch set. Anyway I will collect the comments from the owner of the impacted platforms. Thanks, Dandan > > Thanks > Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38596): https://edk2.groups.io/g/devel/message/38596 Mute This Topic: https://groups.io/mt/30896393/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
