-----Original Message-----
From: Oram, Isaac W <isaac.w.oram@...>
Sent: Tuesday, January 11, 2022 6:20 PM
To: devel@edk2.groups.io
Cc: Oram, Isaac W <isaac.w.oram@...>; Gao, Liming
<gaoliming@...>; Desimone, Nathaniel L
<nathaniel.l.desimone@...>
Subject: [edk2-devel][edk2-platforms][PATCH V1 04/27] IpmiFeaturePkg: 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@...>
Cc: Nate DeSimone <nathaniel.l.desimone@...>

Signed-off-by: Isaac Oram <isaac.w.oram@...>
---

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.
inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.i
nf | 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
| 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
| 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/
GenericIpmi.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/P
eiGenericIpmi.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Smm
/SmmGenericIpmi.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFeatu
re.dsc | 36 ++++++++++----------

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMem
ory.fdf | 16 ++++-----

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMemo
ry.fdf | 6 ++--

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.in
f | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiI
nit.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiIni
t.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLi
b/IpmiBaseLib.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLi
bNull/IpmiBaseLibNull.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiComm
andLib/IpmiCommandLib.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatfor
mHookLibNull/IpmiPlatformHookLibNull.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBas
eLib/PeiIpmiBaseLib.inf | 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiB
aseLib/SmmIpmiBaseLib.inf | 2 +-
Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf
| 2 +-

Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatu
s.inf | 2 +-
21 files changed, 47 insertions(+), 47 deletions(-)

diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.inf
index a84813f55c..7cd60e417b 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAc
pi.
+++ inf
@@ -22,7 +22,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.inf
index 665b3d9bda..388dd2740c 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElo
g.
+++ inf
@@ -21,7 +21,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiDriverEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
index 85836cd8ee..61222e0c00 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
@@ -21,7 +21,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
index 7ad00ae574..797dbe6a07 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
@@ -20,7 +20,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
PeimEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/GenericIpmi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/GenericIpmi.inf
index 9881f9e3d0..8d80aeb6b5 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/GenericIpmi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx
e/
+++ GenericIpmi.inf
@@ -36,7 +36,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
MemoryAllocationLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/PeiGenericIpmi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/PeiGenericIpmi.inf
index 883a9168e5..a646161ce1 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/PeiGenericIpmi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei
/
+++ PeiGenericIpmi.inf
@@ -33,7 +33,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
PeimEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/SmmGenericIpmi.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/SmmGenericIpmi.inf
index a534f7dac8..f430195d1e 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/SmmGenericIpmi.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Sm
m/
+++ SmmGenericIpmi.inf
@@ -27,7 +27,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
MemoryAllocationLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
index a6eccb428b..c1ce340da2 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
ture.dsc
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/IpmiFea
t
+++ ure.dsc
@@ -47,8 +47,8 @@
#####################################
# IPMI Feature Package
#####################################
-
IpmiCommandLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCo
mmandLib/IpmiCommandLib.inf
-
IpmiPlatformHookLib|OutOfBandManagement/IpmiFeaturePkg/Library/Ipm
iPlatformHookLibNull/IpmiPlatformHookLibNull.inf
+
+
IpmiCommandLib|IpmiFeaturePkg/Library/IpmiCommandLib/IpmiCommand
Lib.in
+ f
+
IpmiPlatformHookLib|IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/Ipm
+ iPlatformHookLibNull.inf

[LibraryClasses.common.PEI_CORE,LibraryClasses.common.PEIM]
#######################################
@@ -65,7 +65,7 @@
#####################################
# IPMI Feature Package
#####################################
-
IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiBaseL
ib/PeiIpmiBaseLib.inf
+ IpmiBaseLib|IpmiFeaturePkg/Library/PeiIpmiBaseLib/PeiIpmiBaseLib.inf

[LibraryClasses.common.DXE_DRIVER,LibraryClasses.common.UEFI_DRIVER]
#######################################
@@ -82,7 +82,7 @@
#####################################
# IPMI Feature Package
#####################################
-
IpmiBaseLib|OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBaseLib/
IpmiBaseLib.inf
+ IpmiBaseLib|IpmiFeaturePkg/Library/IpmiBaseLib/IpmiBaseLib.inf


##########################################################
######################
#
@@ -112,14 +112,14 @@
# Add library instances here that are not included in package components
and should be tested
# in the package build.

-
OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/
IpmiPlatformHookLibNull.inf
+
+
IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull
+ .inf

#
# Add components here that should be included in the package build.
#
-
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.i
nf
- OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
- OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf
+ IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf
+ IpmiFeaturePkg/Frb/FrbPei.inf
+ IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf

#
# Feature DXE Components
@@ -135,20 +135,20 @@
# Add library instances here that are not included in package components
and should be tested
# in the package build.

-
OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/
IpmiPlatformHookLibNull.inf
+
+
IpmiFeaturePkg/Library/IpmiPlatformHookLibNull/IpmiPlatformHookLibNull
+ .inf

#
# Add components here that should be included in the package build.
#
-
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
-
OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIp
miBaseLib.inf
- OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
- OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf
- OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
- OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf
- OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
- OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf
- OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf
+ IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
+ IpmiFeaturePkg/Library/SmmIpmiBaseLib/SmmIpmiBaseLib.inf
+ IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
+ IpmiFeaturePkg/BmcElog/BmcElog.inf
+ IpmiFeaturePkg/Frb/FrbDxe.inf
+ IpmiFeaturePkg/IpmiFru/IpmiFru.inf
+ IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
+ IpmiFeaturePkg/OsWdt/OsWdt.inf
+ IpmiFeaturePkg/SolStatus/SolStatus.inf


##########################################################
#########################################
#
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
index cbd9453cf0..158b5455d8 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mory.fdf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PostMe
mo
+++ ry.fdf
@@ -7,11 +7,11 @@
#
##

- INF
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
- INF OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
- INF RuleOverride = DRIVER_ACPITABLE
OutOfBandManagement/IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
- INF OutOfBandManagement/IpmiFeaturePkg/BmcElog/BmcElog.inf
- INF OutOfBandManagement/IpmiFeaturePkg/Frb/FrbDxe.inf
- INF OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru.inf
- INF OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.inf
- INF OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolStatus.inf
+ INF IpmiFeaturePkg/GenericIpmi/Dxe/GenericIpmi.inf
+ INF IpmiFeaturePkg/IpmiInit/DxeIpmiInit.inf
+ INF RuleOverride = DRIVER_ACPITABLE
+ IpmiFeaturePkg/BmcAcpi/BmcAcpi.inf
+ INF IpmiFeaturePkg/BmcElog/BmcElog.inf
+ INF IpmiFeaturePkg/Frb/FrbDxe.inf
+ INF IpmiFeaturePkg/IpmiFru/IpmiFru.inf
+ INF IpmiFeaturePkg/OsWdt/OsWdt.inf
+ INF IpmiFeaturePkg/SolStatus/SolStatus.inf
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mory.fdf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mory.fdf
index 826490952b..d214988bd1 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mory.fdf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/PreMe
mor
+++ y.fdf
@@ -7,6 +7,6 @@
#
##

-INF
OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.i
nf
-INF OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf
-INF OutOfBandManagement/IpmiFeaturePkg/Frb/FrbPei.inf
+INF IpmiFeaturePkg/GenericIpmi/Pei/PeiGenericIpmi.inf
+INF IpmiFeaturePkg/IpmiInit/PeiIpmiInit.inf
+INF IpmiFeaturePkg/Frb/FrbPei.inf
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.inf
index 0778b221c1..322f061a0f 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiFru/IpmiFru
.
+++ inf
@@ -21,7 +21,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiDriverEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
iInit.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
iInit.inf
index 831bfb0b5e..8236fe4842 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
iInit.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/DxeIpm
i
+++ Init.inf
@@ -21,7 +21,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
Init.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
Init.inf
index 607a185eb6..3fb31c729a 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
Init.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/IpmiInit/PeiIpmi
+++ Init.inf
@@ -21,7 +21,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
PeimEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLib/IpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLib/IpmiBaseLib.inf
index 86df943560..72ca3495fb 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLib/IpmiBaseLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
e
+++ Lib/IpmiBaseLib.inf
@@ -18,7 +18,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLibNull/IpmiBaseLibNull.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLibNull/IpmiBaseLibNull.inf
index 5478f9842b..52f8863032 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
eLibNull/IpmiBaseLibNull.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiBas
e
+++ LibNull/IpmiBaseLibNull.inf
@@ -24,7 +24,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
BaseLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCom
mandLib/IpmiCommandLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCo
mmandLib/IpmiCommandLib.inf
index f8e7ba5a8f..d5c14ff2a4 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCom
mandLib/IpmiCommandLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiCo
mm
+++ andLib/IpmiCommandLib.inf
@@ -24,7 +24,7 @@
[Packages]
MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
BaseMemoryLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatf
ormHookLibNull/IpmiPlatformHookLibNull.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlat
formHookLibNull/IpmiPlatformHookLibNull.inf
index ab270079aa..8e472ebdad 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlatf
ormHookLibNull/IpmiPlatformHookLibNull.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/IpmiPlat
+++ formHookLibNull/IpmiPlatformHookLibNull.inf
@@ -20,7 +20,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
DebugLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
aseLib/PeiIpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
aseLib/PeiIpmiBaseLib.inf
index 9a2c87873f..234492db65 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
aseLib/PeiIpmiBaseLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/PeiIpmiB
+++ aseLib/PeiIpmiBaseLib.inf
@@ -18,7 +18,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
DebugLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpm
iBaseLib/SmmIpmiBaseLib.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIp
miBaseLib/SmmIpmiBaseLib.inf
index bb1ccf1ca2..7ea688fc16 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIpm
iBaseLib/SmmIpmiBaseLib.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Library/SmmIp
miB
+++ aseLib/SmmIpmiBaseLib.inf
@@ -18,7 +18,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiBootServicesTableLib
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
index 7e7d2826cb..3fd1078271 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/OsWdt/OsWdt.i
nf
@@ -20,7 +20,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[LibraryClasses]
UefiDriverEntryPoint
diff --git
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
tus.inf
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
tus.inf
index 826144e537..9019b849ac 100644
---
a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
tus.inf
+++
b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/SolStatus/SolSta
+++ tus.inf
@@ -21,7 +21,7 @@

[Packages]
MdePkg/MdePkg.dec
- OutOfBandManagement/IpmiFeaturePkg/IpmiFeaturePkg.dec
+ IpmiFeaturePkg/IpmiFeaturePkg.dec

[Pcd]
gIpmiFeaturePkgTokenSpaceGuid.PcdMaxSOLChannels
--
2.27.0.windows.1