Reviewed-by: Nate DeSimone <nathaniel.l.desimone@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.oram@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; Bi, Dandan <dandan.bi@intel.com>
> Subject: [edk2-devel][edk2-platforms][PATCH V1 10/27]
> UserAuthFeaturePkg: 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: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Dandan Bi <dandan.bi@intel.com>
>
> Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
> ---
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.fd
> f | 6 +++---
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeatur
> e.dsc | 12 ++++++------
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPasswo
> rdLibNull/PlatformPasswordLibNull.inf | 2 +-
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordLi
> b/UserPasswordLib.inf | 2 +-
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswordUi
> Lib/UserPasswordUiLib.inf | 2 +-
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe
> Smm/UserAuthentication2Dxe.inf | 2 +-
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe
> Smm/UserAuthenticationDxe.inf | 2 +-
>
> Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDxe
> Smm/UserAuthenticationSmm.inf | 2 +-
> 8 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.
> fdf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.
> fdf
> index f0b33aa44c..c534bebcc0 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory.
> fdf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/PostMemory
> +++ .fdf
> @@ -7,6 +7,6 @@
> #
> ##
>
> - INF
> UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuth
> enticationDxe.inf
> - INF
> UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuth
> entication2Dxe.inf
> - INF
> UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuth
> enticationSmm.inf
> + INF
> +
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.i
> nf
> + INF
> +
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe
> .inf
> + INF
> +
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm
> .inf
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeat
> ure.dsc
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFea
> ture.dsc
> index d4f7a5ed23..7eeaf441c1 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFeat
> ure.dsc
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Include/UserAuthFe
> +++ ature.dsc
> @@ -58,8 +58,8 @@
> #####################################
> # User Authentication Feature Package
> #####################################
> -
> PlatformPasswordLib|UserInterface/UserAuthFeaturePkg/Library/PlatformP
> asswordLibNull/PlatformPasswordLibNull.inf
> -
> UserPasswordLib|UserInterface/UserAuthFeaturePkg/Library/UserPasswor
> dLib/UserPasswordLib.inf
> +
> +
> PlatformPasswordLib|UserAuthFeaturePkg/Library/PlatformPasswordLibNul
> l
> + /PlatformPasswordLibNull.inf
> +
> UserPasswordLib|UserAuthFeaturePkg/Library/UserPasswordLib/UserPass
> wor
> + dLib.inf
>
> [LibraryClasses.common.DXE_DRIVER]
> #######################################
> @@ -122,12 +122,12 @@
>
> # Add library instances here that are not included in package components
> and should be tested
> # in the package build.
> -
> UserInterface/UserAuthFeaturePkg/Library/UserPasswordUiLib/UserPassw
> ordUiLib.inf
> + UserAuthFeaturePkg/Library/UserPasswordUiLib/UserPasswordUiLib.inf
>
> # Add components here that should be included in the package build.
> -
> UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuth
> enticationDxe.inf
> -
> UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuth
> entication2Dxe.inf
> -
> UserInterface/UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuth
> enticationSmm.inf
> +
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationDxe.i
> nf
> +
> +
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthentication2Dxe
> .inf
> +
> UserAuthFeaturePkg/UserAuthenticationDxeSmm/UserAuthenticationSmm
> .inf
>
>
> ##########################################################
> #########################################
> #
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPass
> wordLibNull/PlatformPasswordLibNull.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPass
> wordLibNull/PlatformPasswordLibNull.inf
> index 00be14df8a..278fe026a6 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPass
> wordLibNull/PlatformPasswordLibNull.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/PlatformPa
> +++ sswordLibNull/PlatformPasswordLibNull.inf
> @@ -32,7 +32,7 @@
>
> [Packages]
> MdePkg/MdePkg.dec
> - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> + UserAuthFeaturePkg/UserAuthFeaturePkg.dec
>
> [Pcd]
> gUserAuthFeaturePkgTokenSpaceGuid.PcdPasswordCleared ##
> CONSUMES
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPassword
> Lib/UserPasswordLib.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPassword
> Lib/UserPasswordLib.inf
> index 99d84ae637..a3124aa443 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPassword
> Lib/UserPasswordLib.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswo
> +++ rdLib/UserPasswordLib.inf
> @@ -21,7 +21,7 @@
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> + UserAuthFeaturePkg/UserAuthFeaturePkg.dec
>
> [LibraryClasses]
> UefiBootServicesTableLib
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPassword
> UiLib/UserPasswordUiLib.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPassword
> UiLib/UserPasswordUiLib.inf
> index 9ab7d83319..8f6a693d76 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPassword
> UiLib/UserPasswordUiLib.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/Library/UserPasswo
> +++ rdUiLib/UserPasswordUiLib.inf
> @@ -20,7 +20,7 @@
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> + UserAuthFeaturePkg/UserAuthFeaturePkg.dec
>
> [LibraryClasses]
> UefiBootServicesTableLib
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthentication2Dxe.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthentication2Dxe.inf
> index 2c6c3661fb..c47e20f052 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthentication2Dxe.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
> +++ DxeSmm/UserAuthentication2Dxe.inf
> @@ -26,7 +26,7 @@
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> + UserAuthFeaturePkg/UserAuthFeaturePkg.dec
>
> [LibraryClasses]
> BaseLib
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationDxe.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationDxe.inf
> index 58066b588c..bee46a1af2 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationDxe.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
> +++ DxeSmm/UserAuthenticationDxe.inf
> @@ -28,7 +28,7 @@
> [Packages]
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> + UserAuthFeaturePkg/UserAuthFeaturePkg.dec
>
> [LibraryClasses]
> BaseLib
> diff --git
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.inf
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.inf
> index 891e2b981d..b53f70f0e3 100644
> ---
> a/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthenticationDx
> eSmm/UserAuthenticationSmm.inf
> +++
> b/Features/Intel/UserInterface/UserAuthFeaturePkg/UserAuthentication
> +++ DxeSmm/UserAuthenticationSmm.inf
> @@ -27,7 +27,7 @@
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> CryptoPkg/CryptoPkg.dec
> - UserInterface/UserAuthFeaturePkg/UserAuthFeaturePkg.dec
> + UserAuthFeaturePkg/UserAuthFeaturePkg.dec
>
> [LibraryClasses]
> UefiBootServicesTableLib
> --
> 2.27.0.windows.1
>
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#85634): https://edk2.groups.io/g/devel/message/85634
Mute This Topic: https://groups.io/mt/88365337/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-