Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com> > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Oram, > Isaac W > Sent: Tuesday, January 11, 2022 6:20 PM > To: devel@edk2.groups.io > Cc: Oram, Isaac W <isaac.w.o...@intel.com>; Chaganty, Rangasai V > <rangasai.v.chaga...@intel.com>; Gao, Liming <gaolim...@byosoft.com.cn> > Subject: [edk2-devel][edk2-platforms][PATCH V1 22/27] > AdvancedFeaturePkg: Fix all relative package paths > > Packages should be at the root of a PACKAGES_PATH entry. > At some point, paths were relative to edk2-platforms/Features/Intel which > was functional, but interferes with the proper functioning of packaging tools. > > Cc: Sai Chaganty <rangasai.v.chaga...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Signed-off-by: Isaac Oram <isaac.w.o...@intel.com> > --- > Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc | 15 > ++++++++------- > Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf | 15 > ++++++++------- > Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf | 15 > ++++++++------- > 3 files changed, 24 insertions(+), 21 deletions(-) > > diff --git > a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc > b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc > index ac9ab80e8e..874b8ce7db 100644 > --- a/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc > +++ b/Features/Intel/AdvancedFeaturePkg/Include/AdvancedFeatures.dsc > @@ -14,45 +14,46 @@ > # Debug Advanced Features > # > !if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable == > TRUE > - !include Debugging/AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc > + !include AcpiDebugFeaturePkg/Include/AcpiDebugFeature.dsc > !endif > + > !if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable > == TRUE > - !include > Debugging/Usb3DebugFeaturePkg/Include/Usb3DebugFeature.dsc > + !include Usb3DebugFeaturePkg/Include/Usb3DebugFeature.dsc > !endif > > # > # Network Advanced Features > # > !if gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable == > TRUE > - !include Network/NetworkFeaturePkg/Include/NetworkFeature.dsc > + !include NetworkFeaturePkg/Include/NetworkFeature.dsc > !endif > > # > # Out-of-Band Management Advanced Features # !if > gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable == TRUE > - !include > OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeature.dsc > + !include IpmiFeaturePkg/Include/IpmiFeature.dsc > !endif > > # > # Power Management Advanced Features > # > !if gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable == TRUE > - !include PowerManagement/S3FeaturePkg/Include/S3Feature.dsc > + !include S3FeaturePkg/Include/S3Feature.dsc > !endif > > # > # System Information Advanced Features > # > !if gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable == TRUE > - !include > SystemInformation/SmbiosFeaturePkg/Include/SmbiosFeature.dsc > + !include SmbiosFeaturePkg/Include/SmbiosFeature.dsc > !endif > > # > # User Interface Advanced Features > # > !if > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnabl > e == TRUE > - !include > UserInterface/UserAuthFeaturePkg/Include/UserAuthFeature.dsc > + !include UserAuthFeaturePkg/Include/UserAuthFeature.dsc > !endif > > !if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE diff -- > git a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf > b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf > index c49a0fd875..e710fe7f01 100644 > --- a/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf > +++ b/Features/Intel/AdvancedFeaturePkg/Include/PostMemory.fdf > @@ -15,45 +15,46 @@ > # Debug Advanced Features > # > !if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable == > TRUE > - !include Debugging/AcpiDebugFeaturePkg/Include/PostMemory.fdf > + !include AcpiDebugFeaturePkg/Include/PostMemory.fdf > !endif > + > !if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable > == TRUE > - !include Debugging/Usb3DebugFeaturePkg/Include/PostMemory.fdf > + !include Usb3DebugFeaturePkg/Include/PostMemory.fdf > !endif > > # > # Network Advanced Features > # > !if gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable == > TRUE > - !include Network/NetworkFeaturePkg/Include/PostMemory.fdf > + !include NetworkFeaturePkg/Include/PostMemory.fdf > !endif > > # > # Out-of-Band Management Advanced Features # !if > gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable == TRUE > - !include > OutOfBandManagement/IpmiFeaturePkg/Include/PostMemory.fdf > + !include IpmiFeaturePkg/Include/PostMemory.fdf > !endif > > # > # Power Management Advanced Features > # > !if gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable == TRUE > - !include PowerManagement/S3FeaturePkg/Include/PostMemory.fdf > + !include S3FeaturePkg/Include/PostMemory.fdf > !endif > > # > # System Information Advanced Features > # > !if gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable == TRUE > - !include SystemInformation/SmbiosFeaturePkg/Include/PostMemory.fdf > + !include SmbiosFeaturePkg/Include/PostMemory.fdf > !endif > > # > # User Interface Advanced Features > # > !if > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnabl > e == TRUE > - !include UserInterface/UserAuthFeaturePkg/Include/PostMemory.fdf > + !include UserAuthFeaturePkg/Include/PostMemory.fdf > !endif > > !if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE diff -- > git a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf > b/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf > index 1b21e96a5f..177aafc1ec 100644 > --- a/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf > +++ b/Features/Intel/AdvancedFeaturePkg/Include/PreMemory.fdf > @@ -15,45 +15,46 @@ > # Debug Advanced Features > # > !if gAcpiDebugFeaturePkgTokenSpaceGuid.PcdAcpiDebugFeatureEnable == > TRUE > - !include Debugging/AcpiDebugFeaturePkg/Include/PreMemory.fdf > + !include AcpiDebugFeaturePkg/Include/PreMemory.fdf > !endif > + > !if gUsb3DebugFeaturePkgTokenSpaceGuid.PcdUsb3DebugFeatureEnable > == TRUE > - !include Debugging/Usb3DebugFeaturePkg/Include/PreMemory.fdf > + !include Usb3DebugFeaturePkg/Include/PreMemory.fdf > !endif > > # > # Network Advanced Features > # > !if gNetworkFeaturePkgTokenSpaceGuid.PcdNetworkFeatureEnable == > TRUE > - !include Network/NetworkFeaturePkg/Include/PreMemory.fdf > + !include NetworkFeaturePkg/Include/PreMemory.fdf > !endif > > # > # Out-of-Band Management Advanced Features # !if > gIpmiFeaturePkgTokenSpaceGuid.PcdIpmiFeatureEnable == TRUE > - !include > OutOfBandManagement/IpmiFeaturePkg/Include/PreMemory.fdf > + !include IpmiFeaturePkg/Include/PreMemory.fdf > !endif > > # > # Power Management Advanced Features > # > !if gS3FeaturePkgTokenSpaceGuid.PcdS3FeatureEnable == TRUE > - !include PowerManagement/S3FeaturePkg/Include/PreMemory.fdf > + !include S3FeaturePkg/Include/PreMemory.fdf > !endif > > # > # System Information Advanced Features > # > !if gSmbiosFeaturePkgTokenSpaceGuid.PcdSmbiosFeatureEnable == TRUE > - !include SystemInformation/SmbiosFeaturePkg/Include/PreMemory.fdf > + !include SmbiosFeaturePkg/Include/PreMemory.fdf > !endif > > # > # User Interface Advanced Features > # > !if > gUserAuthFeaturePkgTokenSpaceGuid.PcdUserAuthenticationFeatureEnabl > e == TRUE > - !include UserInterface/UserAuthFeaturePkg/Include/PreMemory.fdf > + !include UserAuthFeaturePkg/Include/PreMemory.fdf > !endif > > !if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE > -- > 2.27.0.windows.1 > > > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#85643): https://edk2.groups.io/g/devel/message/85643 Mute This Topic: https://groups.io/mt/88365348/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
