From: "Oram, Isaac W" <isaac.w.oram@intel.com>
To: devel@edk2.groups.io
Cc: Isaac Oram <isaac.w.oram@intel.com>,
Sai Chaganty <rangasai.v.chaganty@intel.com>,
Liming Gao <gaoliming@byosoft.com.cn>
Subject: [edk2-devel][edk2-platforms][PATCH V1 22/27] AdvancedFeaturePkg: Fix all relative package paths
Date: Tue, 11 Jan 2022 18:20:22 -0800 [thread overview]
Message-ID: <a04ba463d7bba527ee5ae8aa551ff7d39a8ffdc7.1641953242.git.isaac.w.oram@intel.com> (raw)
In-Reply-To: <cover.1641953242.git.isaac.w.oram@intel.com>
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.chaganty@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Isaac Oram <isaac.w.oram@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.PcdUserAuthenticationFeatureEnable == 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.PcdUserAuthenticationFeatureEnable == 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.PcdUserAuthenticationFeatureEnable == TRUE
- !include UserInterface/UserAuthFeaturePkg/Include/PreMemory.fdf
+ !include UserAuthFeaturePkg/Include/PreMemory.fdf
!endif
!if gLogoFeaturePkgTokenSpaceGuid.PcdLogoFeatureEnable == TRUE
--
2.27.0.windows.1
next prev parent reply other threads:[~2022-01-12 2:20 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 2:20 [edk2-devel][edk2-platforms][PATCH V1 00/27] Improve feature build consistency Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 01/27] BeepDebugFeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:47 ` Nate DeSimone
2022-01-19 23:30 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 02/27] BeepDebugFeaturePkg: Fix all relative package paths Oram, Isaac W
2022-01-13 2:47 ` Nate DeSimone
2022-01-14 5:27 ` Chaganty, Rangasai V
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 03/27] AcpiDebugFeaturePkg: " Oram, Isaac W
2022-01-13 2:48 ` Nate DeSimone
2022-01-14 5:18 ` Chaganty, Rangasai V
2022-01-18 22:59 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 04/27] IpmiFeaturePkg: " Oram, Isaac W
2022-01-13 2:48 ` Nate DeSimone
2022-01-19 0:02 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 05/27] IpmiFeaturePkg: Fix build errors Oram, Isaac W
2022-01-13 2:48 ` Nate DeSimone
2022-01-18 23:38 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 06/27] S3FeaturePkg: Fix all relative package paths Oram, Isaac W
2022-01-13 2:48 ` Nate DeSimone
2022-01-14 5:19 ` Chaganty, Rangasai V
2022-01-19 1:11 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 07/27] S3FeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-14 5:29 ` Chaganty, Rangasai V
2022-01-19 1:26 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 08/27] SmbiosFeaturePkg: Fix all relative package paths Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-14 5:31 ` Chaganty, Rangasai V
2022-01-19 1:40 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 09/27] SmbiosFeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 10/27] UserAuthFeaturePkg: Fix all relative package paths Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 11/27] UserAuthFeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 12/27] VirtualKeyboardFeaturePkg: Fix all relative package paths Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 13/27] VirtualKeyboardFeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 14/27] VirtualKeyboardFeaturePkg: Add feature enable PCD Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 15/27] NetworkFeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-14 5:57 ` Chaganty, Rangasai V
2022-01-19 2:31 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 16/27] LogoFeaturePkg: " Oram, Isaac W
2022-01-13 2:49 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 17/27] PostCodeDebugFeaturePkg: Complete as an advanced feature Oram, Isaac W
2022-01-13 2:48 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 18/27] AcpiDebugFeaturePkg: Use MinPlatformPkg build include files Oram, Isaac W
2022-01-13 2:47 ` Nate DeSimone
2022-01-19 23:30 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 19/27] Usb3DebugFeaturePkg: Align with feature design guidelines Oram, Isaac W
2022-01-13 2:47 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 20/27] SpcrFeaturePkg: Use MinPlatform build include files Oram, Isaac W
2022-01-13 2:50 ` Nate DeSimone
2022-01-14 6:10 ` Chaganty, Rangasai V
2022-01-19 19:09 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 21/27] TemplateFeaturePkg: " Oram, Isaac W
2022-01-13 2:50 ` Nate DeSimone
2022-01-14 6:05 ` Chaganty, Rangasai V
2022-01-19 19:13 ` Oram, Isaac W
2022-01-12 2:20 ` Oram, Isaac W [this message]
2022-01-13 2:50 ` [edk2-devel][edk2-platforms][PATCH V1 22/27] AdvancedFeaturePkg: Fix all relative package paths Nate DeSimone
2022-01-14 5:39 ` Chaganty, Rangasai V
2022-01-19 19:17 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 23/27] AdvancedFeaturePkg: Add missing features Oram, Isaac W
2022-01-13 2:50 ` Nate DeSimone
2022-01-14 5:36 ` Chaganty, Rangasai V
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 24/27] MinPlatformPkg/Build: Add an include file for the common SPI FV info Oram, Isaac W
2022-01-13 2:50 ` Nate DeSimone
2022-01-14 6:02 ` Chaganty, Rangasai V
2022-01-19 19:20 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 25/27] WhitleyOpenBoardPkg/Build: Use common SPI FV Header include Oram, Isaac W
2022-01-13 2:50 ` Nate DeSimone
2022-01-19 19:34 ` Oram, Isaac W
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 26/27] AdvancedFeaturePkg/Build: Add FDF to create FV for all features Oram, Isaac W
2022-01-13 2:47 ` Nate DeSimone
2022-01-12 2:20 ` [edk2-devel][edk2-platforms][PATCH V1 27/27] WhitleyOpenBoardPkg/Build: Enable Features/Intel features Oram, Isaac W
2022-01-13 2:51 ` Nate DeSimone
2022-01-13 2:47 ` [edk2-devel][edk2-platforms][PATCH V1 00/27] Improve feature build consistency Nate DeSimone
2022-01-13 3:15 ` Oram, Isaac W
2022-01-13 3:52 ` Nate DeSimone
2022-01-13 3:53 ` Nate DeSimone
2022-01-13 19:33 ` Oram, Isaac W
2022-01-19 23:30 ` Nate DeSimone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a04ba463d7bba527ee5ae8aa551ff7d39a8ffdc7.1641953242.git.isaac.w.oram@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox