* [PATCH v2 0/6] Enable CI in Intel FSP Packages
@ 2022-09-15 18:55 Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 1/6] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
` (7 more replies)
0 siblings, 8 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel
Cc: Chasel Chiu, Liming Gao, Michael D Kinney, Nate DeSimone,
Sean Brogan, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
- Enables CI in IntelFsp2Pkg and IntelFsp2WrapperPkg.
- Fixes several pre-existing issues that impact common CI checks.
You can find the CI results for the packages with this change
in the following edk2 PR:
https://github.com/tianocore/edk2/pull/3347
V2 Changes:
1. The pre-existing compilation issue in IntelFsp2Pkg that caused
the following BZ to be filed in v1 is now resolved. Therefore,
the compiler CI plugin is enabled in IntelFsp2Pkg now.
https://bugzilla.tianocore.org/show_bug.cgi?id=4049
2. The following patch is dropped from v2:
[PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate
LibraryClasses entry
Chasel indicated this is an intentional design decision so
platforms do not have to override the entire library instance
during platform integration.
Consequently, "FspWrapperPlatformMultiPhaseLib" was added to the
ignore list for the "LibraryClassCheck" CI plugin in
IntelFspWrapperPkg.ci.yaml.
Rebased series on f46c7d1e36c9 and added v1 R-b tags.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Michael Kubacki (6):
IntelFsp2Pkg: Fix code formatting errors
IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID
IntelFsp2Pkg: Add CI YAML file
IntelFsp2WrapperPkg: Fix code formatting errors
IntelFsp2WrapperPkg: Add CI YAML file
.azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI
IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c | 9 +-
IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c | 2 +-
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c | 4 +
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c | 1 -
IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 8 +-
.azurepipelines/templates/pr-gate-build-job.yml | 3 +
.pytool/CISettings.py | 2 +
IntelFsp2Pkg/Include/Ppi/Variable.h | 8 +-
IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++
IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf | 2 +-
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96 ++++++++++++++++++++
11 files changed, 210 insertions(+), 15 deletions(-)
create mode 100644 IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
create mode 100644 IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
--
2.28.0.windows.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 1/6] IntelFsp2Pkg: Fix code formatting errors
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
@ 2022-09-15 18:55 ` Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 2/6] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID Michael Kubacki
` (6 subsequent siblings)
7 siblings, 0 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
This package did not have CI enabled so code changes were merged
that fail uncrustify formatting. This change updates those files
to include uncustify formatting.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
---
IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c | 9 +++++----
IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c | 2 +-
IntelFsp2Pkg/Include/Ppi/Variable.h | 8 ++++----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
index cb2317bfb240..8e24b946cd88 100644
--- a/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c
@@ -193,8 +193,8 @@ DebugBPrint (
**/
VOID
FillHex (
- UINTN Value,
- CHAR8 *Buffer
+ UINTN Value,
+ CHAR8 *Buffer
)
{
INTN Idx;
@@ -227,8 +227,8 @@ DebugAssertInternal (
VOID
)
{
- CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
- UINTN *Frame;
+ CHAR8 Buffer[MAX_DEBUG_MESSAGE_LENGTH];
+ UINTN *Frame;
Frame = (UINTN *)GetStackFramePointer ();
@@ -250,6 +250,7 @@ DebugAssertInternal (
sizeof (Buffer) / sizeof (CHAR8) - 1
);
}
+
SerialPortWrite ((UINT8 *)"ASSERT DUMP:\n", 13);
while (Frame != NULL) {
FillHex ((UINTN)Frame, Buffer + 9);
diff --git a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
index 69a021f42b39..a0b2193bdeab 100644
--- a/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
+++ b/IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c
@@ -31,6 +31,6 @@ SwapStack (
FspData = GetFspGlobalDataPointer ();
OldStack = FspData->CoreStack;
- FspData->CoreStack = (UINTN) NewStack;
+ FspData->CoreStack = (UINTN)NewStack;
return OldStack;
}
diff --git a/IntelFsp2Pkg/Include/Ppi/Variable.h b/IntelFsp2Pkg/Include/Ppi/Variable.h
index 3e1f4b98a999..581f14880813 100644
--- a/IntelFsp2Pkg/Include/Ppi/Variable.h
+++ b/IntelFsp2Pkg/Include/Ppi/Variable.h
@@ -184,10 +184,10 @@ EFI_STATUS
/// to store data in the PEI environment.
///
struct _EDKII_PEI_VARIABLE_PPI {
- EDKII_PEI_GET_VARIABLE GetVariable;
- EDKII_PEI_GET_NEXT_VARIABLE_NAME GetNextVariableName;
- EDKII_PEI_SET_VARIABLE SetVariable;
- EDKII_PEI_QUERY_VARIABLE_INFO QueryVariableInfo;
+ EDKII_PEI_GET_VARIABLE GetVariable;
+ EDKII_PEI_GET_NEXT_VARIABLE_NAME GetNextVariableName;
+ EDKII_PEI_SET_VARIABLE SetVariable;
+ EDKII_PEI_QUERY_VARIABLE_INFO QueryVariableInfo;
};
extern EFI_GUID gEdkiiPeiVariablePpiGuid;
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 2/6] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 1/6] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
@ 2022-09-15 18:55 ` Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
` (5 subsequent siblings)
7 siblings, 0 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
The FILE_GUID for this library instance file is a duplicate of
Library/SecFspSecPlatformLibNull/SecFspSecPlatformLibNull.inf.
This change replaces the duplicated GUID value with a unique GUID.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
---
IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf b/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
index a79f6aecda6d..b9dd132ea863 100644
--- a/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
+++ b/IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf
@@ -15,7 +15,7 @@
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = BaseFspMultiPhaseLib
- FILE_GUID = C128CADC-623E-4E41-97CB-A7138E627460
+ FILE_GUID = 74C14477-E742-4A0A-9787-27B1CF34F698
MODULE_TYPE = SEC
VERSION_STRING = 1.0
LIBRARY_CLASS = FspMultiPhaseLib
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 1/6] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 2/6] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID Michael Kubacki
@ 2022-09-15 18:55 ` Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 4/6] IntelFsp2WrapperPkg: Fix code formatting errors Michael Kubacki
` (4 subsequent siblings)
7 siblings, 0 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
Adds IntelFsp2Pkg to the list of supported build packages for edk2
CI and defines an initial set of CI configuration options.
The compiler plugin is disabled as the package currently does not
build due to some changes in the FSP 2.4 interface addition.
Specifically, in commit df25a54 "Fsp24SecCore<API>.inf" files were
added to IntelFspPkg.dsc but the actual files were not added.
Simply removing these files from the DSC exposes a linker failure.
Recommendation:
1. Enable package CI (accept this change)
2. Add IntelFsp2Pkg.dsc to the "CompilerPlugin" "DscPath" in
IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml to enable compilation
3. Verify compilation and all currently enabled package CI checks
pass
4. Check-in fixes in (3) with change in (2)
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
.pytool/CISettings.py | 1 +
IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index cf9e0d77b19b..0205c26a58f8 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -54,6 +54,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
"ArmVirtPkg",
"DynamicTablesPkg",
"EmulatorPkg",
+ "IntelFsp2Pkg",
"MdePkg",
"MdeModulePkg",
"NetworkPkg",
diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
new file mode 100644
index 000000000000..9ce401b20164
--- /dev/null
+++ b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
@@ -0,0 +1,90 @@
+## @file
+# Core CI configuration for IntelFsp2Pkg
+#
+# Copyright (c) Microsoft Corporation
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+{
+ ## options defined .pytool/Plugin/LicenseCheck
+ "LicenseCheck": {
+ "IgnoreFiles": []
+ },
+
+ "EccCheck": {
+ ## Exception sample looks like below:
+ ## "ExceptionList": [
+ ## "<ErrorID>", "<KeyWord>"
+ ## ]
+ "ExceptionList": [
+ ],
+ ## Both file path and directory path are accepted.
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/CompilerPlugin
+ "CompilerPlugin": {
+ "DscPath": "IntelFsp2Pkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
+ "HostUnitTestCompilerPlugin": {
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/CharEncodingCheck
+ "CharEncodingCheck": {
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/DependencyCheck
+ "DependencyCheck": {
+ "AcceptableDependencies": [
+ "IntelFsp2Pkg/IntelFsp2Pkg.dec",
+ "MdeModulePkg/MdeModulePkg.dec",
+ "MdePkg/MdePkg.dec",
+ "UefiCpuPkg/UefiCpuPkg.dec"
+ ],
+ # For host based unit tests
+ "AcceptableDependencies-HOST_APPLICATION":[
+ "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
+ ],
+ # For UEFI shell based apps
+ "AcceptableDependencies-UEFI_APPLICATION":[],
+ "IgnoreInf": []
+ },
+
+ ## options defined .pytool/Plugin/DscCompleteCheck
+ "DscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "IntelFsp2Pkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
+ "HostUnitTestDscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/GuidCheck
+ "GuidCheck": {
+ "IgnoreGuidName": [],
+ "IgnoreGuidValue": [],
+ "IgnoreFoldersAndFiles": [],
+ "IgnoreDuplicates": [],
+ },
+
+ ## options defined .pytool/Plugin/LibraryClassCheck
+ "LibraryClassCheck": {
+ "IgnoreHeaderFile": []
+ },
+
+ ## options defined .pytool/Plugin/SpellCheck
+ "SpellCheck": {
+ "AuditOnly": True, # Fails right now with over 270 errors
+ "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
+ "ExtendWords": [], # words to extend to the dictionary for this package
+ "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
+ "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
+ }
+}
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 4/6] IntelFsp2WrapperPkg: Fix code formatting errors
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
` (2 preceding siblings ...)
2022-09-15 18:55 ` [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
@ 2022-09-15 18:55 ` Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file Michael Kubacki
` (3 subsequent siblings)
7 siblings, 0 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
This package did not have CI enabled so code changes were merged
that fail uncrustify formatting. This change updates those files
to include uncustify formatting.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
---
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c | 4 ++++
IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c | 1 -
IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 8 ++++----
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
index 5b5beb5c6557..2e82a0c1b59a 100644
--- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
+++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c
@@ -115,6 +115,7 @@ CallFspNotifyPhase (
} else {
Status = Execute64BitCode ((UINTN)NotifyPhaseApi, (UINTN)NotifyPhaseParams, (UINTN)NULL);
}
+
SetInterruptState (InterruptState);
return Status;
@@ -152,6 +153,7 @@ CallFspMemoryInit (
} else {
Status = Execute64BitCode ((UINTN)FspMemoryInitApi, (UINTN)FspmUpdDataPtr, (UINTN)HobListPtr);
}
+
SetInterruptState (InterruptState);
return Status;
@@ -187,6 +189,7 @@ CallTempRamExit (
} else {
Status = Execute64BitCode ((UINTN)TempRamExitApi, (UINTN)TempRamExitParam, (UINTN)NULL);
}
+
SetInterruptState (InterruptState);
return Status;
@@ -222,6 +225,7 @@ CallFspSiliconInit (
} else {
Status = Execute64BitCode ((UINTN)FspSiliconInitApi, (UINTN)FspsUpdDataPtr, (UINTN)NULL);
}
+
SetInterruptState (InterruptState);
return Status;
diff --git a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
index a17ca7dcabe8..c8248eb88851 100644
--- a/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
+++ b/IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c
@@ -69,4 +69,3 @@ Execute64BitCode (
{
return EFI_UNSUPPORTED;
}
-
diff --git a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
index d2acb2fd46cd..fb0d9a8683a9 100644
--- a/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
+++ b/IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c
@@ -10,10 +10,10 @@
#include <FspEas.h>
typedef struct {
- EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
- UINT64 MicrocodeRegionSize;
- EFI_PHYSICAL_ADDRESS CodeRegionBase;
- UINT64 CodeRegionSize;
+ EFI_PHYSICAL_ADDRESS MicrocodeRegionBase;
+ UINT64 MicrocodeRegionSize;
+ EFI_PHYSICAL_ADDRESS CodeRegionBase;
+ UINT64 CodeRegionSize;
} FSPT_CORE_UPD;
typedef struct {
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
` (3 preceding siblings ...)
2022-09-15 18:55 ` [PATCH v2 4/6] IntelFsp2WrapperPkg: Fix code formatting errors Michael Kubacki
@ 2022-09-15 18:55 ` Michael Kubacki
2022-10-04 16:01 ` [edk2-devel] " Michael D Kinney
2022-09-15 18:55 ` [PATCH v2 6/6] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI Michael Kubacki
` (2 subsequent siblings)
7 siblings, 1 reply; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel; +Cc: Chasel Chiu, Nate DeSimone, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
Adds IntelFsp2WrapperPkg to the list of supported build packages
for edk2 CI and defines an initial set of CI configuration options.
Adds a special case for the Library Class check CI plugin to ignore
FspWrapperPlatformMultiPhaseLib with an explanatory comment.
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
.pytool/CISettings.py | 1 +
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96 ++++++++++++++++++++
2 files changed, 97 insertions(+)
diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index 0205c26a58f8..d9a260784e59 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
"DynamicTablesPkg",
"EmulatorPkg",
"IntelFsp2Pkg",
+ "IntelFsp2WrapperPkg",
"MdePkg",
"MdeModulePkg",
"NetworkPkg",
diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
new file mode 100644
index 000000000000..55f28d90870c
--- /dev/null
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
@@ -0,0 +1,96 @@
+## @file
+# Core CI configuration for IntelFsp2WrapperPkg
+#
+# Copyright (c) Microsoft Corporation
+#
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+##
+{
+ ## options defined .pytool/Plugin/LicenseCheck
+ "LicenseCheck": {
+ "IgnoreFiles": []
+ },
+
+ "EccCheck": {
+ ## Exception sample looks like below:
+ ## "ExceptionList": [
+ ## "<ErrorID>", "<KeyWord>"
+ ## ]
+ "ExceptionList": [
+ ],
+ ## Both file path and directory path are accepted.
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/CompilerPlugin
+ "CompilerPlugin": {
+ "DscPath": "IntelFsp2WrapperPkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
+ "HostUnitTestCompilerPlugin": {
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/CharEncodingCheck
+ "CharEncodingCheck": {
+ "IgnoreFiles": []
+ },
+
+ ## options defined .pytool/Plugin/DependencyCheck
+ "DependencyCheck": {
+ "AcceptableDependencies": [
+ "IntelFsp2Pkg/IntelFsp2Pkg.dec",
+ "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
+ "MdeModulePkg/MdeModulePkg.dec",
+ "MdePkg/MdePkg.dec",
+ "SecurityPkg/SecurityPkg.dec",
+ "UefiCpuPkg/UefiCpuPkg.dec"
+ ],
+ # For host based unit tests
+ "AcceptableDependencies-HOST_APPLICATION":[
+ "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
+ ],
+ # For UEFI shell based apps
+ "AcceptableDependencies-UEFI_APPLICATION":[],
+ "IgnoreInf": []
+ },
+
+ ## options defined .pytool/Plugin/DscCompleteCheck
+ "DscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "IntelFsp2WrapperPkg.dsc"
+ },
+
+ ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
+ "HostUnitTestDscCompleteCheck": {
+ "IgnoreInf": [""],
+ "DscPath": "" # Don't support this test
+ },
+
+ ## options defined .pytool/Plugin/GuidCheck
+ "GuidCheck": {
+ "IgnoreGuidName": [],
+ "IgnoreGuidValue": [],
+ "IgnoreFoldersAndFiles": [],
+ "IgnoreDuplicates": [],
+ },
+
+ ## options defined .pytool/Plugin/LibraryClassCheck
+ "LibraryClassCheck": {
+ "IgnoreLibraryClass": [
+ # This header file contains a small function in a separate library so platforms
+ # do not have to override the whole main library instance.
+ "FspWrapperPlatformMultiPhaseLib"
+ ]
+ },
+
+ ## options defined .pytool/Plugin/SpellCheck
+ "SpellCheck": {
+ "AuditOnly": True, # Fails right now with over 270 errors
+ "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
+ "ExtendWords": [], # words to extend to the dictionary for this package
+ "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
+ "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
+ }
+}
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 6/6] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
` (4 preceding siblings ...)
2022-09-15 18:55 ` [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file Michael Kubacki
@ 2022-09-15 18:55 ` Michael Kubacki
[not found] ` <17151D8FB6D820D9.18791@groups.io>
2022-10-04 16:02 ` [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael D Kinney
7 siblings, 0 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 18:55 UTC (permalink / raw)
To: devel
Cc: Bret Barkelew, Chasel Chiu, Liming Gao, Michael D Kinney,
Nate DeSimone, Sean Brogan, Star Zeng
From: Michael Kubacki <michael.kubacki@microsoft.com>
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
Adds these packages to a new edk2 matrix job so they can be validated
in edk2 CI.
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Star Zeng <star.zeng@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
---
.azurepipelines/templates/pr-gate-build-job.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.azurepipelines/templates/pr-gate-build-job.yml b/.azurepipelines/templates/pr-gate-build-job.yml
index 0e4ad019bf03..759d7e9b4005 100644
--- a/.azurepipelines/templates/pr-gate-build-job.yml
+++ b/.azurepipelines/templates/pr-gate-build-job.yml
@@ -45,6 +45,9 @@ jobs:
TARGET_CRYPTO:
Build.Pkgs: 'CryptoPkg'
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
+ TARGET_FSP:
+ Build.Pkgs: 'IntelFsp2Pkg,IntelFsp2WrapperPkg'
+ Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
TARGET_SECURITY:
Build.Pkgs: 'SecurityPkg'
Build.Targets: 'DEBUG,RELEASE,NO-TARGET,NOOPT'
--
2.28.0.windows.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file
[not found] ` <17151D8FB6D820D9.18791@groups.io>
@ 2022-09-15 19:41 ` Michael Kubacki
2022-09-23 1:07 ` Michael Kubacki
0 siblings, 1 reply; 17+ messages in thread
From: Michael Kubacki @ 2022-09-15 19:41 UTC (permalink / raw)
To: devel, Chasel Chiu; +Cc: Nate DeSimone, Star Zeng
Hi Chasel,
Your CI YAML file feedback in v1 is addressed now in v2.
Can you please provide your review on this patch and [PATCH v2 5/6]?
Note that I updated the commit message for this patch to remove the info
about the build being broken since that was recently fixed. That update
is in the branch:
https://github.com/makubacki/edk2/commit/c37e6dfa482ed075cd4ab6712e6d17b3cf17786a
With these reviews, the series will be covered.
Thanks,
Michael
On 9/15/2022 2:55 PM, Michael Kubacki wrote:
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> Adds IntelFsp2Pkg to the list of supported build packages for edk2
> CI and defines an initial set of CI configuration options.
>
> The compiler plugin is disabled as the package currently does not
> build due to some changes in the FSP 2.4 interface addition.
>
> Specifically, in commit df25a54 "Fsp24SecCore<API>.inf" files were
> added to IntelFspPkg.dsc but the actual files were not added.
>
> Simply removing these files from the DSC exposes a linker failure.
>
> Recommendation:
>
> 1. Enable package CI (accept this change)
> 2. Add IntelFsp2Pkg.dsc to the "CompilerPlugin" "DscPath" in
> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml to enable compilation
> 3. Verify compilation and all currently enabled package CI checks
> pass
> 4. Check-in fixes in (3) with change in (2)
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> .pytool/CISettings.py | 1 +
> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++++
> 2 files changed, 91 insertions(+)
>
> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
> index cf9e0d77b19b..0205c26a58f8 100644
> --- a/.pytool/CISettings.py
> +++ b/.pytool/CISettings.py
> @@ -54,6 +54,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
> "ArmVirtPkg",
> "DynamicTablesPkg",
> "EmulatorPkg",
> + "IntelFsp2Pkg",
> "MdePkg",
> "MdeModulePkg",
> "NetworkPkg",
> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
> new file mode 100644
> index 000000000000..9ce401b20164
> --- /dev/null
> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
> @@ -0,0 +1,90 @@
> +## @file
> +# Core CI configuration for IntelFsp2Pkg
> +#
> +# Copyright (c) Microsoft Corporation
> +#
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +##
> +{
> + ## options defined .pytool/Plugin/LicenseCheck
> + "LicenseCheck": {
> + "IgnoreFiles": []
> + },
> +
> + "EccCheck": {
> + ## Exception sample looks like below:
> + ## "ExceptionList": [
> + ## "<ErrorID>", "<KeyWord>"
> + ## ]
> + "ExceptionList": [
> + ],
> + ## Both file path and directory path are accepted.
> + "IgnoreFiles": []
> + },
> +
> + ## options defined .pytool/Plugin/CompilerPlugin
> + "CompilerPlugin": {
> + "DscPath": "IntelFsp2Pkg.dsc"
> + },
> +
> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
> + "HostUnitTestCompilerPlugin": {
> + "DscPath": "" # Don't support this test
> + },
> +
> + ## options defined .pytool/Plugin/CharEncodingCheck
> + "CharEncodingCheck": {
> + "IgnoreFiles": []
> + },
> +
> + ## options defined .pytool/Plugin/DependencyCheck
> + "DependencyCheck": {
> + "AcceptableDependencies": [
> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
> + "MdeModulePkg/MdeModulePkg.dec",
> + "MdePkg/MdePkg.dec",
> + "UefiCpuPkg/UefiCpuPkg.dec"
> + ],
> + # For host based unit tests
> + "AcceptableDependencies-HOST_APPLICATION":[
> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
> + ],
> + # For UEFI shell based apps
> + "AcceptableDependencies-UEFI_APPLICATION":[],
> + "IgnoreInf": []
> + },
> +
> + ## options defined .pytool/Plugin/DscCompleteCheck
> + "DscCompleteCheck": {
> + "IgnoreInf": [""],
> + "DscPath": "IntelFsp2Pkg.dsc"
> + },
> +
> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
> + "HostUnitTestDscCompleteCheck": {
> + "IgnoreInf": [""],
> + "DscPath": "" # Don't support this test
> + },
> +
> + ## options defined .pytool/Plugin/GuidCheck
> + "GuidCheck": {
> + "IgnoreGuidName": [],
> + "IgnoreGuidValue": [],
> + "IgnoreFoldersAndFiles": [],
> + "IgnoreDuplicates": [],
> + },
> +
> + ## options defined .pytool/Plugin/LibraryClassCheck
> + "LibraryClassCheck": {
> + "IgnoreHeaderFile": []
> + },
> +
> + ## options defined .pytool/Plugin/SpellCheck
> + "SpellCheck": {
> + "AuditOnly": True, # Fails right now with over 270 errors
> + "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
> + "ExtendWords": [], # words to extend to the dictionary for this package
> + "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
> + "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
> + }
> +}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file
2022-09-15 19:41 ` [edk2-devel] [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
@ 2022-09-23 1:07 ` Michael Kubacki
2022-10-03 14:44 ` Michael Kubacki
0 siblings, 1 reply; 17+ messages in thread
From: Michael Kubacki @ 2022-09-23 1:07 UTC (permalink / raw)
To: devel, Chasel Chiu
Review reminder
On 9/15/2022 3:41 PM, Michael Kubacki wrote:
> Hi Chasel,
>
> Your CI YAML file feedback in v1 is addressed now in v2.
>
> Can you please provide your review on this patch and [PATCH v2 5/6]?
>
> Note that I updated the commit message for this patch to remove the info
> about the build being broken since that was recently fixed. That update
> is in the branch:
>
> https://github.com/makubacki/edk2/commit/c37e6dfa482ed075cd4ab6712e6d17b3cf17786a
>
>
> With these reviews, the series will be covered.
>
> Thanks,
> Michael
>
> On 9/15/2022 2:55 PM, Michael Kubacki wrote:
>> From: Michael Kubacki <michael.kubacki@microsoft.com>
>>
>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>>
>> Adds IntelFsp2Pkg to the list of supported build packages for edk2
>> CI and defines an initial set of CI configuration options.
>>
>> The compiler plugin is disabled as the package currently does not
>> build due to some changes in the FSP 2.4 interface addition.
>>
>> Specifically, in commit df25a54 "Fsp24SecCore<API>.inf" files were
>> added to IntelFspPkg.dsc but the actual files were not added.
>>
>> Simply removing these files from the DSC exposes a linker failure.
>>
>> Recommendation:
>>
>> 1. Enable package CI (accept this change)
>> 2. Add IntelFsp2Pkg.dsc to the "CompilerPlugin" "DscPath" in
>> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml to enable compilation
>> 3. Verify compilation and all currently enabled package CI checks
>> pass
>> 4. Check-in fixes in (3) with change in (2)
>>
>> Cc: Chasel Chiu <chasel.chiu@intel.com>
>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
>> Cc: Star Zeng <star.zeng@intel.com>
>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>> ---
>> .pytool/CISettings.py | 1 +
>> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++++
>> 2 files changed, 91 insertions(+)
>>
>> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
>> index cf9e0d77b19b..0205c26a58f8 100644
>> --- a/.pytool/CISettings.py
>> +++ b/.pytool/CISettings.py
>> @@ -54,6 +54,7 @@ class Settings(CiBuildSettingsManager,
>> UpdateSettingsManager, SetupSettingsManag
>> "ArmVirtPkg",
>> "DynamicTablesPkg",
>> "EmulatorPkg",
>> + "IntelFsp2Pkg",
>> "MdePkg",
>> "MdeModulePkg",
>> "NetworkPkg",
>> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>> b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>> new file mode 100644
>> index 000000000000..9ce401b20164
>> --- /dev/null
>> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>> @@ -0,0 +1,90 @@
>> +## @file
>> +# Core CI configuration for IntelFsp2Pkg
>> +#
>> +# Copyright (c) Microsoft Corporation
>> +#
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> +##
>> +{
>> + ## options defined .pytool/Plugin/LicenseCheck
>> + "LicenseCheck": {
>> + "IgnoreFiles": []
>> + },
>> +
>> + "EccCheck": {
>> + ## Exception sample looks like below:
>> + ## "ExceptionList": [
>> + ## "<ErrorID>", "<KeyWord>"
>> + ## ]
>> + "ExceptionList": [
>> + ],
>> + ## Both file path and directory path are accepted.
>> + "IgnoreFiles": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/CompilerPlugin
>> + "CompilerPlugin": {
>> + "DscPath": "IntelFsp2Pkg.dsc"
>> + },
>> +
>> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
>> + "HostUnitTestCompilerPlugin": {
>> + "DscPath": "" # Don't support this test
>> + },
>> +
>> + ## options defined .pytool/Plugin/CharEncodingCheck
>> + "CharEncodingCheck": {
>> + "IgnoreFiles": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/DependencyCheck
>> + "DependencyCheck": {
>> + "AcceptableDependencies": [
>> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
>> + "MdeModulePkg/MdeModulePkg.dec",
>> + "MdePkg/MdePkg.dec",
>> + "UefiCpuPkg/UefiCpuPkg.dec"
>> + ],
>> + # For host based unit tests
>> + "AcceptableDependencies-HOST_APPLICATION":[
>> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
>> + ],
>> + # For UEFI shell based apps
>> + "AcceptableDependencies-UEFI_APPLICATION":[],
>> + "IgnoreInf": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/DscCompleteCheck
>> + "DscCompleteCheck": {
>> + "IgnoreInf": [""],
>> + "DscPath": "IntelFsp2Pkg.dsc"
>> + },
>> +
>> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
>> + "HostUnitTestDscCompleteCheck": {
>> + "IgnoreInf": [""],
>> + "DscPath": "" # Don't support this test
>> + },
>> +
>> + ## options defined .pytool/Plugin/GuidCheck
>> + "GuidCheck": {
>> + "IgnoreGuidName": [],
>> + "IgnoreGuidValue": [],
>> + "IgnoreFoldersAndFiles": [],
>> + "IgnoreDuplicates": [],
>> + },
>> +
>> + ## options defined .pytool/Plugin/LibraryClassCheck
>> + "LibraryClassCheck": {
>> + "IgnoreHeaderFile": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/SpellCheck
>> + "SpellCheck": {
>> + "AuditOnly": True, # Fails right now with over 270
>> errors
>> + "IgnoreFiles": [], # use gitignore syntax to ignore
>> errors in matching files
>> + "ExtendWords": [], # words to extend to the
>> dictionary for this package
>> + "IgnoreStandardPaths": [], # Standard Plugin defined paths
>> that should be ignore
>> + "AdditionalIncludePaths": [] # Additional paths to spell
>> check (wildcards supported)
>> + }
>> +}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file
2022-09-23 1:07 ` Michael Kubacki
@ 2022-10-03 14:44 ` Michael Kubacki
2022-10-03 18:46 ` Michael Kubacki
0 siblings, 1 reply; 17+ messages in thread
From: Michael Kubacki @ 2022-10-03 14:44 UTC (permalink / raw)
To: devel, Chasel Chiu
Another reminder.
On 9/22/2022 9:07 PM, Michael Kubacki wrote:
> Review reminder
>
> On 9/15/2022 3:41 PM, Michael Kubacki wrote:
>> Hi Chasel,
>>
>> Your CI YAML file feedback in v1 is addressed now in v2.
>>
>> Can you please provide your review on this patch and [PATCH v2 5/6]?
>>
>> Note that I updated the commit message for this patch to remove the
>> info about the build being broken since that was recently fixed. That
>> update is in the branch:
>>
>> https://github.com/makubacki/edk2/commit/c37e6dfa482ed075cd4ab6712e6d17b3cf17786a
>>
>>
>> With these reviews, the series will be covered.
>>
>> Thanks,
>> Michael
>>
>> On 9/15/2022 2:55 PM, Michael Kubacki wrote:
>>> From: Michael Kubacki <michael.kubacki@microsoft.com>
>>>
>>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>>>
>>> Adds IntelFsp2Pkg to the list of supported build packages for edk2
>>> CI and defines an initial set of CI configuration options.
>>>
>>> The compiler plugin is disabled as the package currently does not
>>> build due to some changes in the FSP 2.4 interface addition.
>>>
>>> Specifically, in commit df25a54 "Fsp24SecCore<API>.inf" files were
>>> added to IntelFspPkg.dsc but the actual files were not added.
>>>
>>> Simply removing these files from the DSC exposes a linker failure.
>>>
>>> Recommendation:
>>>
>>> 1. Enable package CI (accept this change)
>>> 2. Add IntelFsp2Pkg.dsc to the "CompilerPlugin" "DscPath" in
>>> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml to enable compilation
>>> 3. Verify compilation and all currently enabled package CI checks
>>> pass
>>> 4. Check-in fixes in (3) with change in (2)
>>>
>>> Cc: Chasel Chiu <chasel.chiu@intel.com>
>>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
>>> Cc: Star Zeng <star.zeng@intel.com>
>>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>>> ---
>>> .pytool/CISettings.py | 1 +
>>> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++++
>>> 2 files changed, 91 insertions(+)
>>>
>>> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
>>> index cf9e0d77b19b..0205c26a58f8 100644
>>> --- a/.pytool/CISettings.py
>>> +++ b/.pytool/CISettings.py
>>> @@ -54,6 +54,7 @@ class Settings(CiBuildSettingsManager,
>>> UpdateSettingsManager, SetupSettingsManag
>>> "ArmVirtPkg",
>>> "DynamicTablesPkg",
>>> "EmulatorPkg",
>>> + "IntelFsp2Pkg",
>>> "MdePkg",
>>> "MdeModulePkg",
>>> "NetworkPkg",
>>> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>>> b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>>> new file mode 100644
>>> index 000000000000..9ce401b20164
>>> --- /dev/null
>>> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>>> @@ -0,0 +1,90 @@
>>> +## @file
>>> +# Core CI configuration for IntelFsp2Pkg
>>> +#
>>> +# Copyright (c) Microsoft Corporation
>>> +#
>>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>>> +##
>>> +{
>>> + ## options defined .pytool/Plugin/LicenseCheck
>>> + "LicenseCheck": {
>>> + "IgnoreFiles": []
>>> + },
>>> +
>>> + "EccCheck": {
>>> + ## Exception sample looks like below:
>>> + ## "ExceptionList": [
>>> + ## "<ErrorID>", "<KeyWord>"
>>> + ## ]
>>> + "ExceptionList": [
>>> + ],
>>> + ## Both file path and directory path are accepted.
>>> + "IgnoreFiles": []
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/CompilerPlugin
>>> + "CompilerPlugin": {
>>> + "DscPath": "IntelFsp2Pkg.dsc"
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
>>> + "HostUnitTestCompilerPlugin": {
>>> + "DscPath": "" # Don't support this test
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/CharEncodingCheck
>>> + "CharEncodingCheck": {
>>> + "IgnoreFiles": []
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/DependencyCheck
>>> + "DependencyCheck": {
>>> + "AcceptableDependencies": [
>>> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
>>> + "MdeModulePkg/MdeModulePkg.dec",
>>> + "MdePkg/MdePkg.dec",
>>> + "UefiCpuPkg/UefiCpuPkg.dec"
>>> + ],
>>> + # For host based unit tests
>>> + "AcceptableDependencies-HOST_APPLICATION":[
>>> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
>>> + ],
>>> + # For UEFI shell based apps
>>> + "AcceptableDependencies-UEFI_APPLICATION":[],
>>> + "IgnoreInf": []
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/DscCompleteCheck
>>> + "DscCompleteCheck": {
>>> + "IgnoreInf": [""],
>>> + "DscPath": "IntelFsp2Pkg.dsc"
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
>>> + "HostUnitTestDscCompleteCheck": {
>>> + "IgnoreInf": [""],
>>> + "DscPath": "" # Don't support this test
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/GuidCheck
>>> + "GuidCheck": {
>>> + "IgnoreGuidName": [],
>>> + "IgnoreGuidValue": [],
>>> + "IgnoreFoldersAndFiles": [],
>>> + "IgnoreDuplicates": [],
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/LibraryClassCheck
>>> + "LibraryClassCheck": {
>>> + "IgnoreHeaderFile": []
>>> + },
>>> +
>>> + ## options defined .pytool/Plugin/SpellCheck
>>> + "SpellCheck": {
>>> + "AuditOnly": True, # Fails right now with over 270
>>> errors
>>> + "IgnoreFiles": [], # use gitignore syntax to
>>> ignore errors in matching files
>>> + "ExtendWords": [], # words to extend to the
>>> dictionary for this package
>>> + "IgnoreStandardPaths": [], # Standard Plugin defined paths
>>> that should be ignore
>>> + "AdditionalIncludePaths": [] # Additional paths to spell
>>> check (wildcards supported)
>>> + }
>>> +}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file
2022-10-03 14:44 ` Michael Kubacki
@ 2022-10-03 18:46 ` Michael Kubacki
0 siblings, 0 replies; 17+ messages in thread
From: Michael Kubacki @ 2022-10-03 18:46 UTC (permalink / raw)
To: devel, Chasel Chiu, Nate DeSimone, Star Zeng
+Other IntelFsp2Pkg & IntelFsp2WrapperPkg maintainers to To line
Please review the remaining patches in this patch series:
https://edk2.groups.io/g/devel/message/93859
Thanks,
Michael
On 10/3/2022 10:44 AM, Michael Kubacki wrote:
> Another reminder.
>
> On 9/22/2022 9:07 PM, Michael Kubacki wrote:
>> Review reminder
>>
>> On 9/15/2022 3:41 PM, Michael Kubacki wrote:
>>> Hi Chasel,
>>>
>>> Your CI YAML file feedback in v1 is addressed now in v2.
>>>
>>> Can you please provide your review on this patch and [PATCH v2 5/6]?
>>>
>>> Note that I updated the commit message for this patch to remove the
>>> info about the build being broken since that was recently fixed. That
>>> update is in the branch:
>>>
>>> https://github.com/makubacki/edk2/commit/c37e6dfa482ed075cd4ab6712e6d17b3cf17786a
>>>
>>>
>>> With these reviews, the series will be covered.
>>>
>>> Thanks,
>>> Michael
>>>
>>> On 9/15/2022 2:55 PM, Michael Kubacki wrote:
>>>> From: Michael Kubacki <michael.kubacki@microsoft.com>
>>>>
>>>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>>>>
>>>> Adds IntelFsp2Pkg to the list of supported build packages for edk2
>>>> CI and defines an initial set of CI configuration options.
>>>>
>>>> The compiler plugin is disabled as the package currently does not
>>>> build due to some changes in the FSP 2.4 interface addition.
>>>>
>>>> Specifically, in commit df25a54 "Fsp24SecCore<API>.inf" files were
>>>> added to IntelFspPkg.dsc but the actual files were not added.
>>>>
>>>> Simply removing these files from the DSC exposes a linker failure.
>>>>
>>>> Recommendation:
>>>>
>>>> 1. Enable package CI (accept this change)
>>>> 2. Add IntelFsp2Pkg.dsc to the "CompilerPlugin" "DscPath" in
>>>> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml to enable compilation
>>>> 3. Verify compilation and all currently enabled package CI checks
>>>> pass
>>>> 4. Check-in fixes in (3) with change in (2)
>>>>
>>>> Cc: Chasel Chiu <chasel.chiu@intel.com>
>>>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
>>>> Cc: Star Zeng <star.zeng@intel.com>
>>>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>>>> ---
>>>> .pytool/CISettings.py | 1 +
>>>> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++++
>>>> 2 files changed, 91 insertions(+)
>>>>
>>>> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
>>>> index cf9e0d77b19b..0205c26a58f8 100644
>>>> --- a/.pytool/CISettings.py
>>>> +++ b/.pytool/CISettings.py
>>>> @@ -54,6 +54,7 @@ class Settings(CiBuildSettingsManager,
>>>> UpdateSettingsManager, SetupSettingsManag
>>>> "ArmVirtPkg",
>>>> "DynamicTablesPkg",
>>>> "EmulatorPkg",
>>>> + "IntelFsp2Pkg",
>>>> "MdePkg",
>>>> "MdeModulePkg",
>>>> "NetworkPkg",
>>>> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>>>> b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>>>> new file mode 100644
>>>> index 000000000000..9ce401b20164
>>>> --- /dev/null
>>>> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
>>>> @@ -0,0 +1,90 @@
>>>> +## @file
>>>> +# Core CI configuration for IntelFsp2Pkg
>>>> +#
>>>> +# Copyright (c) Microsoft Corporation
>>>> +#
>>>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>>>> +##
>>>> +{
>>>> + ## options defined .pytool/Plugin/LicenseCheck
>>>> + "LicenseCheck": {
>>>> + "IgnoreFiles": []
>>>> + },
>>>> +
>>>> + "EccCheck": {
>>>> + ## Exception sample looks like below:
>>>> + ## "ExceptionList": [
>>>> + ## "<ErrorID>", "<KeyWord>"
>>>> + ## ]
>>>> + "ExceptionList": [
>>>> + ],
>>>> + ## Both file path and directory path are accepted.
>>>> + "IgnoreFiles": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/CompilerPlugin
>>>> + "CompilerPlugin": {
>>>> + "DscPath": "IntelFsp2Pkg.dsc"
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
>>>> + "HostUnitTestCompilerPlugin": {
>>>> + "DscPath": "" # Don't support this test
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/CharEncodingCheck
>>>> + "CharEncodingCheck": {
>>>> + "IgnoreFiles": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/DependencyCheck
>>>> + "DependencyCheck": {
>>>> + "AcceptableDependencies": [
>>>> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
>>>> + "MdeModulePkg/MdeModulePkg.dec",
>>>> + "MdePkg/MdePkg.dec",
>>>> + "UefiCpuPkg/UefiCpuPkg.dec"
>>>> + ],
>>>> + # For host based unit tests
>>>> + "AcceptableDependencies-HOST_APPLICATION":[
>>>> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
>>>> + ],
>>>> + # For UEFI shell based apps
>>>> + "AcceptableDependencies-UEFI_APPLICATION":[],
>>>> + "IgnoreInf": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/DscCompleteCheck
>>>> + "DscCompleteCheck": {
>>>> + "IgnoreInf": [""],
>>>> + "DscPath": "IntelFsp2Pkg.dsc"
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
>>>> + "HostUnitTestDscCompleteCheck": {
>>>> + "IgnoreInf": [""],
>>>> + "DscPath": "" # Don't support this test
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/GuidCheck
>>>> + "GuidCheck": {
>>>> + "IgnoreGuidName": [],
>>>> + "IgnoreGuidValue": [],
>>>> + "IgnoreFoldersAndFiles": [],
>>>> + "IgnoreDuplicates": [],
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/LibraryClassCheck
>>>> + "LibraryClassCheck": {
>>>> + "IgnoreHeaderFile": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/SpellCheck
>>>> + "SpellCheck": {
>>>> + "AuditOnly": True, # Fails right now with over
>>>> 270 errors
>>>> + "IgnoreFiles": [], # use gitignore syntax to
>>>> ignore errors in matching files
>>>> + "ExtendWords": [], # words to extend to the
>>>> dictionary for this package
>>>> + "IgnoreStandardPaths": [], # Standard Plugin defined
>>>> paths that should be ignore
>>>> + "AdditionalIncludePaths": [] # Additional paths to spell
>>>> check (wildcards supported)
>>>> + }
>>>> +}
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
2022-09-15 18:55 ` [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file Michael Kubacki
@ 2022-10-04 16:01 ` Michael D Kinney
2022-10-04 16:21 ` Michael Kubacki
0 siblings, 1 reply; 17+ messages in thread
From: Michael D Kinney @ 2022-10-04 16:01 UTC (permalink / raw)
To: devel@edk2.groups.io, mikuback@linux.microsoft.com,
Kinney, Michael D
Cc: Chiu, Chasel, Desimone, Nathaniel L, Zeng, Star
Michael,
This looks like a design issue in the IntelFsp2WrapperPkg for 2
lib classes to point to the same include file.
Do you have a recommended fix for this issue?
I am ok with this YAML file that ignores the error, but I think
a new issue should be opened to fix this package to follow the
standard package rules.
Mike
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael Kubacki
> Sent: Thursday, September 15, 2022 11:55 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> Adds IntelFsp2WrapperPkg to the list of supported build packages
> for edk2 CI and defines an initial set of CI configuration options.
>
> Adds a special case for the Library Class check CI plugin to ignore
> FspWrapperPlatformMultiPhaseLib with an explanatory comment.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> ---
> .pytool/CISettings.py | 1 +
> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96 ++++++++++++++++++++
> 2 files changed, 97 insertions(+)
>
> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
> index 0205c26a58f8..d9a260784e59 100644
> --- a/.pytool/CISettings.py
> +++ b/.pytool/CISettings.py
> @@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
> "DynamicTablesPkg",
> "EmulatorPkg",
> "IntelFsp2Pkg",
> + "IntelFsp2WrapperPkg",
> "MdePkg",
> "MdeModulePkg",
> "NetworkPkg",
> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> new file mode 100644
> index 000000000000..55f28d90870c
> --- /dev/null
> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> @@ -0,0 +1,96 @@
> +## @file
> +# Core CI configuration for IntelFsp2WrapperPkg
> +#
> +# Copyright (c) Microsoft Corporation
> +#
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +##
> +{
> + ## options defined .pytool/Plugin/LicenseCheck
> + "LicenseCheck": {
> + "IgnoreFiles": []
> + },
> +
> + "EccCheck": {
> + ## Exception sample looks like below:
> + ## "ExceptionList": [
> + ## "<ErrorID>", "<KeyWord>"
> + ## ]
> + "ExceptionList": [
> + ],
> + ## Both file path and directory path are accepted.
> + "IgnoreFiles": []
> + },
> +
> + ## options defined .pytool/Plugin/CompilerPlugin
> + "CompilerPlugin": {
> + "DscPath": "IntelFsp2WrapperPkg.dsc"
> + },
> +
> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
> + "HostUnitTestCompilerPlugin": {
> + "DscPath": "" # Don't support this test
> + },
> +
> + ## options defined .pytool/Plugin/CharEncodingCheck
> + "CharEncodingCheck": {
> + "IgnoreFiles": []
> + },
> +
> + ## options defined .pytool/Plugin/DependencyCheck
> + "DependencyCheck": {
> + "AcceptableDependencies": [
> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
> + "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
> + "MdeModulePkg/MdeModulePkg.dec",
> + "MdePkg/MdePkg.dec",
> + "SecurityPkg/SecurityPkg.dec",
> + "UefiCpuPkg/UefiCpuPkg.dec"
> + ],
> + # For host based unit tests
> + "AcceptableDependencies-HOST_APPLICATION":[
> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
> + ],
> + # For UEFI shell based apps
> + "AcceptableDependencies-UEFI_APPLICATION":[],
> + "IgnoreInf": []
> + },
> +
> + ## options defined .pytool/Plugin/DscCompleteCheck
> + "DscCompleteCheck": {
> + "IgnoreInf": [""],
> + "DscPath": "IntelFsp2WrapperPkg.dsc"
> + },
> +
> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
> + "HostUnitTestDscCompleteCheck": {
> + "IgnoreInf": [""],
> + "DscPath": "" # Don't support this test
> + },
> +
> + ## options defined .pytool/Plugin/GuidCheck
> + "GuidCheck": {
> + "IgnoreGuidName": [],
> + "IgnoreGuidValue": [],
> + "IgnoreFoldersAndFiles": [],
> + "IgnoreDuplicates": [],
> + },
> +
> + ## options defined .pytool/Plugin/LibraryClassCheck
> + "LibraryClassCheck": {
> + "IgnoreLibraryClass": [
> + # This header file contains a small function in a separate library so platforms
> + # do not have to override the whole main library instance.
> + "FspWrapperPlatformMultiPhaseLib"
> + ]
> + },
> +
> + ## options defined .pytool/Plugin/SpellCheck
> + "SpellCheck": {
> + "AuditOnly": True, # Fails right now with over 270 errors
> + "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
> + "ExtendWords": [], # words to extend to the dictionary for this package
> + "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
> + "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
> + }
> +}
> --
> 2.28.0.windows.1
>
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#93864): https://edk2.groups.io/g/devel/message/93864
> Mute This Topic: https://groups.io/mt/93707371/1643496
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [michael.d.kinney@intel.com]
> -=-=-=-=-=-=
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 0/6] Enable CI in Intel FSP Packages
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
` (6 preceding siblings ...)
[not found] ` <17151D8FB6D820D9.18791@groups.io>
@ 2022-10-04 16:02 ` Michael D Kinney
7 siblings, 0 replies; 17+ messages in thread
From: Michael D Kinney @ 2022-10-04 16:02 UTC (permalink / raw)
To: mikuback@linux.microsoft.com, devel@edk2.groups.io,
Kinney, Michael D
Cc: Chiu, Chasel, Gao, Liming, Desimone, Nathaniel L, Sean Brogan,
Zeng, Star
With one comment that IntelFsp2WrapperPkg.dec file needs a new
issue opened to resolve 2 library classes pointing to same
include file.
Series Reviewed-by: Michael D Kinney <michael.d.kinney>
Mike
> -----Original Message-----
> From: mikuback@linux.microsoft.com <mikuback@linux.microsoft.com>
> Sent: Thursday, September 15, 2022 11:55 AM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Kinney, Michael D <michael.d.kinney@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Sean Brogan <sean.brogan@microsoft.com>; Zeng, Star <star.zeng@intel.com>
> Subject: [PATCH v2 0/6] Enable CI in Intel FSP Packages
>
> From: Michael Kubacki <michael.kubacki@microsoft.com>
>
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>
> - Enables CI in IntelFsp2Pkg and IntelFsp2WrapperPkg.
> - Fixes several pre-existing issues that impact common CI checks.
>
> You can find the CI results for the packages with this change
> in the following edk2 PR:
> https://github.com/tianocore/edk2/pull/3347
>
> V2 Changes:
>
> 1. The pre-existing compilation issue in IntelFsp2Pkg that caused
> the following BZ to be filed in v1 is now resolved. Therefore,
> the compiler CI plugin is enabled in IntelFsp2Pkg now.
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=4049
>
> 2. The following patch is dropped from v2:
>
> [PATCH v1 5/7] IntelFsp2WrapperPkg.dec: Remove duplicate
> LibraryClasses entry
>
> Chasel indicated this is an intentional design decision so
> platforms do not have to override the entire library instance
> during platform integration.
>
> Consequently, "FspWrapperPlatformMultiPhaseLib" was added to the
> ignore list for the "LibraryClassCheck" CI plugin in
> IntelFspWrapperPkg.ci.yaml.
>
> Rebased series on f46c7d1e36c9 and added v1 R-b tags.
>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Michael D Kinney <michael.d.kinney@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>
> Michael Kubacki (6):
> IntelFsp2Pkg: Fix code formatting errors
> IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID
> IntelFsp2Pkg: Add CI YAML file
> IntelFsp2WrapperPkg: Fix code formatting errors
> IntelFsp2WrapperPkg: Add CI YAML file
> .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI
>
> IntelFsp2Pkg/Library/BaseFspDebugLibSerialPort/DebugLib.c | 9 +-
> IntelFsp2Pkg/Library/BaseFspSwitchStackLib/FspSwitchStackLib.c | 2 +-
> IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/FspWrapperApiLib.c | 4 +
> IntelFsp2WrapperPkg/Library/BaseFspWrapperApiLib/IA32/DispatchExecute.c | 1 -
> IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/SecRamInitData.c | 8 +-
> .azurepipelines/templates/pr-gate-build-job.yml | 3 +
> .pytool/CISettings.py | 2 +
> IntelFsp2Pkg/Include/Ppi/Variable.h | 8 +-
> IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml | 90 ++++++++++++++++++
> IntelFsp2Pkg/Library/BaseFspMultiPhaseLib/BaseFspMultiPhaseLib.inf | 2 +-
> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96 ++++++++++++++++++++
> 11 files changed, 210 insertions(+), 15 deletions(-)
> create mode 100644 IntelFsp2Pkg/IntelFsp2Pkg.ci.yaml
> create mode 100644 IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
>
> --
> 2.28.0.windows.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
2022-10-04 16:01 ` [edk2-devel] " Michael D Kinney
@ 2022-10-04 16:21 ` Michael Kubacki
2022-10-05 1:27 ` Chiu, Chasel
0 siblings, 1 reply; 17+ messages in thread
From: Michael Kubacki @ 2022-10-04 16:21 UTC (permalink / raw)
To: Kinney, Michael D, devel@edk2.groups.io
Cc: Chiu, Chasel, Desimone, Nathaniel L, Zeng, Star
Hi Mike,
I agree that it is a design issue and I had a patch for it in the v1
series. It did not fix the issue but took a different approach to work
around it for CI enabling.
See the following conversation between Chasel and I regarding that patch:
https://edk2.groups.io/g/devel/message/93319
Since it was described as intended, I removed made that change in the v2
series.
I'm happy to turn the write up into a bug, depending on what maintainers
want to do.
For now I plan to submit this series as-is to get out of the way and let
the maintainers handle it.
Regards,
Michael
On 10/4/2022 12:01 PM, Kinney, Michael D wrote:
> Michael,
>
> This looks like a design issue in the IntelFsp2WrapperPkg for 2
> lib classes to point to the same include file.
>
> Do you have a recommended fix for this issue?
>
> I am ok with this YAML file that ignores the error, but I think
> a new issue should be opened to fix this package to follow the
> standard package rules.
>
> Mike
>
>> -----Original Message-----
>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael Kubacki
>> Sent: Thursday, September 15, 2022 11:55 AM
>> To: devel@edk2.groups.io
>> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
>> Subject: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
>>
>> From: Michael Kubacki <michael.kubacki@microsoft.com>
>>
>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>>
>> Adds IntelFsp2WrapperPkg to the list of supported build packages
>> for edk2 CI and defines an initial set of CI configuration options.
>>
>> Adds a special case for the Library Class check CI plugin to ignore
>> FspWrapperPlatformMultiPhaseLib with an explanatory comment.
>>
>> Cc: Chasel Chiu <chasel.chiu@intel.com>
>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
>> Cc: Star Zeng <star.zeng@intel.com>
>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>> ---
>> .pytool/CISettings.py | 1 +
>> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96 ++++++++++++++++++++
>> 2 files changed, 97 insertions(+)
>>
>> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
>> index 0205c26a58f8..d9a260784e59 100644
>> --- a/.pytool/CISettings.py
>> +++ b/.pytool/CISettings.py
>> @@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
>> "DynamicTablesPkg",
>> "EmulatorPkg",
>> "IntelFsp2Pkg",
>> + "IntelFsp2WrapperPkg",
>> "MdePkg",
>> "MdeModulePkg",
>> "NetworkPkg",
>> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
>> new file mode 100644
>> index 000000000000..55f28d90870c
>> --- /dev/null
>> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
>> @@ -0,0 +1,96 @@
>> +## @file
>> +# Core CI configuration for IntelFsp2WrapperPkg
>> +#
>> +# Copyright (c) Microsoft Corporation
>> +#
>> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>> +##
>> +{
>> + ## options defined .pytool/Plugin/LicenseCheck
>> + "LicenseCheck": {
>> + "IgnoreFiles": []
>> + },
>> +
>> + "EccCheck": {
>> + ## Exception sample looks like below:
>> + ## "ExceptionList": [
>> + ## "<ErrorID>", "<KeyWord>"
>> + ## ]
>> + "ExceptionList": [
>> + ],
>> + ## Both file path and directory path are accepted.
>> + "IgnoreFiles": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/CompilerPlugin
>> + "CompilerPlugin": {
>> + "DscPath": "IntelFsp2WrapperPkg.dsc"
>> + },
>> +
>> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
>> + "HostUnitTestCompilerPlugin": {
>> + "DscPath": "" # Don't support this test
>> + },
>> +
>> + ## options defined .pytool/Plugin/CharEncodingCheck
>> + "CharEncodingCheck": {
>> + "IgnoreFiles": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/DependencyCheck
>> + "DependencyCheck": {
>> + "AcceptableDependencies": [
>> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
>> + "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
>> + "MdeModulePkg/MdeModulePkg.dec",
>> + "MdePkg/MdePkg.dec",
>> + "SecurityPkg/SecurityPkg.dec",
>> + "UefiCpuPkg/UefiCpuPkg.dec"
>> + ],
>> + # For host based unit tests
>> + "AcceptableDependencies-HOST_APPLICATION":[
>> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
>> + ],
>> + # For UEFI shell based apps
>> + "AcceptableDependencies-UEFI_APPLICATION":[],
>> + "IgnoreInf": []
>> + },
>> +
>> + ## options defined .pytool/Plugin/DscCompleteCheck
>> + "DscCompleteCheck": {
>> + "IgnoreInf": [""],
>> + "DscPath": "IntelFsp2WrapperPkg.dsc"
>> + },
>> +
>> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
>> + "HostUnitTestDscCompleteCheck": {
>> + "IgnoreInf": [""],
>> + "DscPath": "" # Don't support this test
>> + },
>> +
>> + ## options defined .pytool/Plugin/GuidCheck
>> + "GuidCheck": {
>> + "IgnoreGuidName": [],
>> + "IgnoreGuidValue": [],
>> + "IgnoreFoldersAndFiles": [],
>> + "IgnoreDuplicates": [],
>> + },
>> +
>> + ## options defined .pytool/Plugin/LibraryClassCheck
>> + "LibraryClassCheck": {
>> + "IgnoreLibraryClass": [
>> + # This header file contains a small function in a separate library so platforms
>> + # do not have to override the whole main library instance.
>> + "FspWrapperPlatformMultiPhaseLib"
>> + ]
>> + },
>> +
>> + ## options defined .pytool/Plugin/SpellCheck
>> + "SpellCheck": {
>> + "AuditOnly": True, # Fails right now with over 270 errors
>> + "IgnoreFiles": [], # use gitignore syntax to ignore errors in matching files
>> + "ExtendWords": [], # words to extend to the dictionary for this package
>> + "IgnoreStandardPaths": [], # Standard Plugin defined paths that should be ignore
>> + "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards supported)
>> + }
>> +}
>> --
>> 2.28.0.windows.1
>>
>>
>>
>> -=-=-=-=-=-=
>> Groups.io Links: You receive all messages sent to this group.
>> View/Reply Online (#93864): https://edk2.groups.io/g/devel/message/93864
>> Mute This Topic: https://groups.io/mt/93707371/1643496
>> Group Owner: devel+owner@edk2.groups.io
>> Unsubscribe: https://edk2.groups.io/g/devel/unsub [michael.d.kinney@intel.com]
>> -=-=-=-=-=-=
>>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
2022-10-04 16:21 ` Michael Kubacki
@ 2022-10-05 1:27 ` Chiu, Chasel
2022-10-05 3:08 ` Michael Kubacki
0 siblings, 1 reply; 17+ messages in thread
From: Chiu, Chasel @ 2022-10-05 1:27 UTC (permalink / raw)
To: Michael Kubacki, Kinney, Michael D, devel@edk2.groups.io
Cc: Desimone, Nathaniel L, Zeng, Star
Hi Michael Kubacki,
Please help to review below patch series which will resolve the duplicate library header in DEC issue.
Thanks,
Chasel
https://edk2.groups.io/g/devel/message/94725
https://edk2.groups.io/g/devel/message/94726
https://edk2.groups.io/g/devel/message/94727
> -----Original Message-----
> From: Michael Kubacki <mikuback@linux.microsoft.com>
> Sent: Tuesday, October 4, 2022 9:22 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> Subject: Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
>
> Hi Mike,
>
> I agree that it is a design issue and I had a patch for it in the v1 series. It did not
> fix the issue but took a different approach to work around it for CI enabling.
>
> See the following conversation between Chasel and I regarding that patch:
> https://edk2.groups.io/g/devel/message/93319
>
> Since it was described as intended, I removed made that change in the v2 series.
>
> I'm happy to turn the write up into a bug, depending on what maintainers want
> to do.
>
> For now I plan to submit this series as-is to get out of the way and let the
> maintainers handle it.
>
> Regards,
> Michael
>
> On 10/4/2022 12:01 PM, Kinney, Michael D wrote:
> > Michael,
> >
> > This looks like a design issue in the IntelFsp2WrapperPkg for 2 lib
> > classes to point to the same include file.
> >
> > Do you have a recommended fix for this issue?
> >
> > I am ok with this YAML file that ignores the error, but I think a new
> > issue should be opened to fix this package to follow the standard
> > package rules.
> >
> > Mike
> >
> >> -----Original Message-----
> >> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> >> Michael Kubacki
> >> Sent: Thursday, September 15, 2022 11:55 AM
> >> To: devel@edk2.groups.io
> >> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> >> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> >> Subject: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML
> >> file
> >>
> >> From: Michael Kubacki <michael.kubacki@microsoft.com>
> >>
> >> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
> >>
> >> Adds IntelFsp2WrapperPkg to the list of supported build packages for
> >> edk2 CI and defines an initial set of CI configuration options.
> >>
> >> Adds a special case for the Library Class check CI plugin to ignore
> >> FspWrapperPlatformMultiPhaseLib with an explanatory comment.
> >>
> >> Cc: Chasel Chiu <chasel.chiu@intel.com>
> >> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> >> Cc: Star Zeng <star.zeng@intel.com>
> >> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> >> ---
> >> .pytool/CISettings.py | 1 +
> >> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96
> ++++++++++++++++++++
> >> 2 files changed, 97 insertions(+)
> >>
> >> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index
> >> 0205c26a58f8..d9a260784e59 100644
> >> --- a/.pytool/CISettings.py
> >> +++ b/.pytool/CISettings.py
> >> @@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager,
> UpdateSettingsManager, SetupSettingsManag
> >> "DynamicTablesPkg",
> >> "EmulatorPkg",
> >> "IntelFsp2Pkg",
> >> + "IntelFsp2WrapperPkg",
> >> "MdePkg",
> >> "MdeModulePkg",
> >> "NetworkPkg",
> >> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> >> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> >> new file mode 100644
> >> index 000000000000..55f28d90870c
> >> --- /dev/null
> >> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> >> @@ -0,0 +1,96 @@
> >> +## @file
> >> +# Core CI configuration for IntelFsp2WrapperPkg # # Copyright (c)
> >> +Microsoft Corporation # # SPDX-License-Identifier:
> >> +BSD-2-Clause-Patent ## {
> >> + ## options defined .pytool/Plugin/LicenseCheck
> >> + "LicenseCheck": {
> >> + "IgnoreFiles": []
> >> + },
> >> +
> >> + "EccCheck": {
> >> + ## Exception sample looks like below:
> >> + ## "ExceptionList": [
> >> + ## "<ErrorID>", "<KeyWord>"
> >> + ## ]
> >> + "ExceptionList": [
> >> + ],
> >> + ## Both file path and directory path are accepted.
> >> + "IgnoreFiles": []
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/CompilerPlugin
> >> + "CompilerPlugin": {
> >> + "DscPath": "IntelFsp2WrapperPkg.dsc"
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
> >> + "HostUnitTestCompilerPlugin": {
> >> + "DscPath": "" # Don't support this test
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/CharEncodingCheck
> >> + "CharEncodingCheck": {
> >> + "IgnoreFiles": []
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/DependencyCheck
> >> + "DependencyCheck": {
> >> + "AcceptableDependencies": [
> >> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
> >> + "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
> >> + "MdeModulePkg/MdeModulePkg.dec",
> >> + "MdePkg/MdePkg.dec",
> >> + "SecurityPkg/SecurityPkg.dec",
> >> + "UefiCpuPkg/UefiCpuPkg.dec"
> >> + ],
> >> + # For host based unit tests
> >> + "AcceptableDependencies-HOST_APPLICATION":[
> >> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
> >> + ],
> >> + # For UEFI shell based apps
> >> + "AcceptableDependencies-UEFI_APPLICATION":[],
> >> + "IgnoreInf": []
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/DscCompleteCheck
> >> + "DscCompleteCheck": {
> >> + "IgnoreInf": [""],
> >> + "DscPath": "IntelFsp2WrapperPkg.dsc"
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
> >> + "HostUnitTestDscCompleteCheck": {
> >> + "IgnoreInf": [""],
> >> + "DscPath": "" # Don't support this test
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/GuidCheck
> >> + "GuidCheck": {
> >> + "IgnoreGuidName": [],
> >> + "IgnoreGuidValue": [],
> >> + "IgnoreFoldersAndFiles": [],
> >> + "IgnoreDuplicates": [],
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/LibraryClassCheck
> >> + "LibraryClassCheck": {
> >> + "IgnoreLibraryClass": [
> >> + # This header file contains a small function in a separate library so
> platforms
> >> + # do not have to override the whole main library instance.
> >> + "FspWrapperPlatformMultiPhaseLib"
> >> + ]
> >> + },
> >> +
> >> + ## options defined .pytool/Plugin/SpellCheck
> >> + "SpellCheck": {
> >> + "AuditOnly": True, # Fails right now with over 270 errors
> >> + "IgnoreFiles": [], # use gitignore syntax to ignore errors in
> matching files
> >> + "ExtendWords": [], # words to extend to the dictionary for this
> package
> >> + "IgnoreStandardPaths": [], # Standard Plugin defined paths that should
> be ignore
> >> + "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards
> supported)
> >> + }
> >> +}
> >> --
> >> 2.28.0.windows.1
> >>
> >>
> >>
> >> -=-=-=-=-=-=
> >> Groups.io Links: You receive all messages sent to this group.
> >> View/Reply Online (#93864):
> >> https://edk2.groups.io/g/devel/message/93864
> >> Mute This Topic: https://groups.io/mt/93707371/1643496
> >> Group Owner: devel+owner@edk2.groups.io
> >> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> >> [michael.d.kinney@intel.com] -=-=-=-=-=-=
> >>
> >
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
2022-10-05 1:27 ` Chiu, Chasel
@ 2022-10-05 3:08 ` Michael Kubacki
2022-10-05 3:59 ` Chiu, Chasel
0 siblings, 1 reply; 17+ messages in thread
From: Michael Kubacki @ 2022-10-05 3:08 UTC (permalink / raw)
To: devel, chasel.chiu, Kinney, Michael D; +Cc: Desimone, Nathaniel L, Zeng, Star
It looks like you only need my review on patch 2/2 which I provided. I
see Nate gave R-b on 1/2 so you should be good to go.
On 10/4/2022 9:27 PM, Chiu, Chasel wrote:
>
> Hi Michael Kubacki,
>
> Please help to review below patch series which will resolve the duplicate library header in DEC issue.
>
> Thanks,
> Chasel
>
> https://edk2.groups.io/g/devel/message/94725
> https://edk2.groups.io/g/devel/message/94726
> https://edk2.groups.io/g/devel/message/94727
>
>
>> -----Original Message-----
>> From: Michael Kubacki <mikuback@linux.microsoft.com>
>> Sent: Tuesday, October 4, 2022 9:22 AM
>> To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
>> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
>> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
>> Subject: Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
>>
>> Hi Mike,
>>
>> I agree that it is a design issue and I had a patch for it in the v1 series. It did not
>> fix the issue but took a different approach to work around it for CI enabling.
>>
>> See the following conversation between Chasel and I regarding that patch:
>> https://edk2.groups.io/g/devel/message/93319
>>
>> Since it was described as intended, I removed made that change in the v2 series.
>>
>> I'm happy to turn the write up into a bug, depending on what maintainers want
>> to do.
>>
>> For now I plan to submit this series as-is to get out of the way and let the
>> maintainers handle it.
>>
>> Regards,
>> Michael
>>
>> On 10/4/2022 12:01 PM, Kinney, Michael D wrote:
>>> Michael,
>>>
>>> This looks like a design issue in the IntelFsp2WrapperPkg for 2 lib
>>> classes to point to the same include file.
>>>
>>> Do you have a recommended fix for this issue?
>>>
>>> I am ok with this YAML file that ignores the error, but I think a new
>>> issue should be opened to fix this package to follow the standard
>>> package rules.
>>>
>>> Mike
>>>
>>>> -----Original Message-----
>>>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
>>>> Michael Kubacki
>>>> Sent: Thursday, September 15, 2022 11:55 AM
>>>> To: devel@edk2.groups.io
>>>> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
>>>> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
>>>> Subject: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML
>>>> file
>>>>
>>>> From: Michael Kubacki <michael.kubacki@microsoft.com>
>>>>
>>>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
>>>>
>>>> Adds IntelFsp2WrapperPkg to the list of supported build packages for
>>>> edk2 CI and defines an initial set of CI configuration options.
>>>>
>>>> Adds a special case for the Library Class check CI plugin to ignore
>>>> FspWrapperPlatformMultiPhaseLib with an explanatory comment.
>>>>
>>>> Cc: Chasel Chiu <chasel.chiu@intel.com>
>>>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
>>>> Cc: Star Zeng <star.zeng@intel.com>
>>>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
>>>> ---
>>>> .pytool/CISettings.py | 1 +
>>>> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96
>> ++++++++++++++++++++
>>>> 2 files changed, 97 insertions(+)
>>>>
>>>> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index
>>>> 0205c26a58f8..d9a260784e59 100644
>>>> --- a/.pytool/CISettings.py
>>>> +++ b/.pytool/CISettings.py
>>>> @@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager,
>> UpdateSettingsManager, SetupSettingsManag
>>>> "DynamicTablesPkg",
>>>> "EmulatorPkg",
>>>> "IntelFsp2Pkg",
>>>> + "IntelFsp2WrapperPkg",
>>>> "MdePkg",
>>>> "MdeModulePkg",
>>>> "NetworkPkg",
>>>> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
>>>> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
>>>> new file mode 100644
>>>> index 000000000000..55f28d90870c
>>>> --- /dev/null
>>>> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
>>>> @@ -0,0 +1,96 @@
>>>> +## @file
>>>> +# Core CI configuration for IntelFsp2WrapperPkg # # Copyright (c)
>>>> +Microsoft Corporation # # SPDX-License-Identifier:
>>>> +BSD-2-Clause-Patent ## {
>>>> + ## options defined .pytool/Plugin/LicenseCheck
>>>> + "LicenseCheck": {
>>>> + "IgnoreFiles": []
>>>> + },
>>>> +
>>>> + "EccCheck": {
>>>> + ## Exception sample looks like below:
>>>> + ## "ExceptionList": [
>>>> + ## "<ErrorID>", "<KeyWord>"
>>>> + ## ]
>>>> + "ExceptionList": [
>>>> + ],
>>>> + ## Both file path and directory path are accepted.
>>>> + "IgnoreFiles": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/CompilerPlugin
>>>> + "CompilerPlugin": {
>>>> + "DscPath": "IntelFsp2WrapperPkg.dsc"
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
>>>> + "HostUnitTestCompilerPlugin": {
>>>> + "DscPath": "" # Don't support this test
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/CharEncodingCheck
>>>> + "CharEncodingCheck": {
>>>> + "IgnoreFiles": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/DependencyCheck
>>>> + "DependencyCheck": {
>>>> + "AcceptableDependencies": [
>>>> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
>>>> + "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
>>>> + "MdeModulePkg/MdeModulePkg.dec",
>>>> + "MdePkg/MdePkg.dec",
>>>> + "SecurityPkg/SecurityPkg.dec",
>>>> + "UefiCpuPkg/UefiCpuPkg.dec"
>>>> + ],
>>>> + # For host based unit tests
>>>> + "AcceptableDependencies-HOST_APPLICATION":[
>>>> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
>>>> + ],
>>>> + # For UEFI shell based apps
>>>> + "AcceptableDependencies-UEFI_APPLICATION":[],
>>>> + "IgnoreInf": []
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/DscCompleteCheck
>>>> + "DscCompleteCheck": {
>>>> + "IgnoreInf": [""],
>>>> + "DscPath": "IntelFsp2WrapperPkg.dsc"
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
>>>> + "HostUnitTestDscCompleteCheck": {
>>>> + "IgnoreInf": [""],
>>>> + "DscPath": "" # Don't support this test
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/GuidCheck
>>>> + "GuidCheck": {
>>>> + "IgnoreGuidName": [],
>>>> + "IgnoreGuidValue": [],
>>>> + "IgnoreFoldersAndFiles": [],
>>>> + "IgnoreDuplicates": [],
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/LibraryClassCheck
>>>> + "LibraryClassCheck": {
>>>> + "IgnoreLibraryClass": [
>>>> + # This header file contains a small function in a separate library so
>> platforms
>>>> + # do not have to override the whole main library instance.
>>>> + "FspWrapperPlatformMultiPhaseLib"
>>>> + ]
>>>> + },
>>>> +
>>>> + ## options defined .pytool/Plugin/SpellCheck
>>>> + "SpellCheck": {
>>>> + "AuditOnly": True, # Fails right now with over 270 errors
>>>> + "IgnoreFiles": [], # use gitignore syntax to ignore errors in
>> matching files
>>>> + "ExtendWords": [], # words to extend to the dictionary for this
>> package
>>>> + "IgnoreStandardPaths": [], # Standard Plugin defined paths that should
>> be ignore
>>>> + "AdditionalIncludePaths": [] # Additional paths to spell check (wildcards
>> supported)
>>>> + }
>>>> +}
>>>> --
>>>> 2.28.0.windows.1
>>>>
>>>>
>>>>
>>>> -=-=-=-=-=-=
>>>> Groups.io Links: You receive all messages sent to this group.
>>>> View/Reply Online (#93864):
>>>> https://edk2.groups.io/g/devel/message/93864
>>>> Mute This Topic: https://groups.io/mt/93707371/1643496
>>>> Group Owner: devel+owner@edk2.groups.io
>>>> Unsubscribe: https://edk2.groups.io/g/devel/unsub
>>>> [michael.d.kinney@intel.com] -=-=-=-=-=-=
>>>>
>>>
>
>
>
>
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
2022-10-05 3:08 ` Michael Kubacki
@ 2022-10-05 3:59 ` Chiu, Chasel
0 siblings, 0 replies; 17+ messages in thread
From: Chiu, Chasel @ 2022-10-05 3:59 UTC (permalink / raw)
To: Michael Kubacki, devel@edk2.groups.io, Kinney, Michael D
Cc: Desimone, Nathaniel L, Zeng, Star
Yes. Thanks Michael!
> -----Original Message-----
> From: Michael Kubacki <mikuback@linux.microsoft.com>
> Sent: Tuesday, October 4, 2022 8:09 PM
> To: devel@edk2.groups.io; Chiu, Chasel <chasel.chiu@intel.com>; Kinney,
> Michael D <michael.d.kinney@intel.com>
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Zeng, Star
> <star.zeng@intel.com>
> Subject: Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file
>
> It looks like you only need my review on patch 2/2 which I provided. I see Nate
> gave R-b on 1/2 so you should be good to go.
>
> On 10/4/2022 9:27 PM, Chiu, Chasel wrote:
> >
> > Hi Michael Kubacki,
> >
> > Please help to review below patch series which will resolve the duplicate
> library header in DEC issue.
> >
> > Thanks,
> > Chasel
> >
> > https://edk2.groups.io/g/devel/message/94725
> > https://edk2.groups.io/g/devel/message/94726
> > https://edk2.groups.io/g/devel/message/94727
> >
> >
> >> -----Original Message-----
> >> From: Michael Kubacki <mikuback@linux.microsoft.com>
> >> Sent: Tuesday, October 4, 2022 9:22 AM
> >> To: Kinney, Michael D <michael.d.kinney@intel.com>;
> >> devel@edk2.groups.io
> >> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> >> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> >> Subject: Re: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI
> >> YAML file
> >>
> >> Hi Mike,
> >>
> >> I agree that it is a design issue and I had a patch for it in the v1
> >> series. It did not fix the issue but took a different approach to work around it
> for CI enabling.
> >>
> >> See the following conversation between Chasel and I regarding that patch:
> >> https://edk2.groups.io/g/devel/message/93319
> >>
> >> Since it was described as intended, I removed made that change in the v2
> series.
> >>
> >> I'm happy to turn the write up into a bug, depending on what
> >> maintainers want to do.
> >>
> >> For now I plan to submit this series as-is to get out of the way and
> >> let the maintainers handle it.
> >>
> >> Regards,
> >> Michael
> >>
> >> On 10/4/2022 12:01 PM, Kinney, Michael D wrote:
> >>> Michael,
> >>>
> >>> This looks like a design issue in the IntelFsp2WrapperPkg for 2 lib
> >>> classes to point to the same include file.
> >>>
> >>> Do you have a recommended fix for this issue?
> >>>
> >>> I am ok with this YAML file that ignores the error, but I think a
> >>> new issue should be opened to fix this package to follow the
> >>> standard package rules.
> >>>
> >>> Mike
> >>>
> >>>> -----Original Message-----
> >>>> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> >>>> Michael Kubacki
> >>>> Sent: Thursday, September 15, 2022 11:55 AM
> >>>> To: devel@edk2.groups.io
> >>>> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> >>>> <nathaniel.l.desimone@intel.com>; Zeng, Star <star.zeng@intel.com>
> >>>> Subject: [edk2-devel] [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI
> >>>> YAML file
> >>>>
> >>>> From: Michael Kubacki <michael.kubacki@microsoft.com>
> >>>>
> >>>> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=4048
> >>>>
> >>>> Adds IntelFsp2WrapperPkg to the list of supported build packages
> >>>> for
> >>>> edk2 CI and defines an initial set of CI configuration options.
> >>>>
> >>>> Adds a special case for the Library Class check CI plugin to ignore
> >>>> FspWrapperPlatformMultiPhaseLib with an explanatory comment.
> >>>>
> >>>> Cc: Chasel Chiu <chasel.chiu@intel.com>
> >>>> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> >>>> Cc: Star Zeng <star.zeng@intel.com>
> >>>> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
> >>>> ---
> >>>> .pytool/CISettings.py | 1 +
> >>>> IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml | 96
> >> ++++++++++++++++++++
> >>>> 2 files changed, 97 insertions(+)
> >>>>
> >>>> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index
> >>>> 0205c26a58f8..d9a260784e59 100644
> >>>> --- a/.pytool/CISettings.py
> >>>> +++ b/.pytool/CISettings.py
> >>>> @@ -55,6 +55,7 @@ class Settings(CiBuildSettingsManager,
> >> UpdateSettingsManager, SetupSettingsManag
> >>>> "DynamicTablesPkg",
> >>>> "EmulatorPkg",
> >>>> "IntelFsp2Pkg",
> >>>> + "IntelFsp2WrapperPkg",
> >>>> "MdePkg",
> >>>> "MdeModulePkg",
> >>>> "NetworkPkg",
> >>>> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> >>>> b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> >>>> new file mode 100644
> >>>> index 000000000000..55f28d90870c
> >>>> --- /dev/null
> >>>> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.ci.yaml
> >>>> @@ -0,0 +1,96 @@
> >>>> +## @file
> >>>> +# Core CI configuration for IntelFsp2WrapperPkg # # Copyright (c)
> >>>> +Microsoft Corporation # # SPDX-License-Identifier:
> >>>> +BSD-2-Clause-Patent ## {
> >>>> + ## options defined .pytool/Plugin/LicenseCheck
> >>>> + "LicenseCheck": {
> >>>> + "IgnoreFiles": []
> >>>> + },
> >>>> +
> >>>> + "EccCheck": {
> >>>> + ## Exception sample looks like below:
> >>>> + ## "ExceptionList": [
> >>>> + ## "<ErrorID>", "<KeyWord>"
> >>>> + ## ]
> >>>> + "ExceptionList": [
> >>>> + ],
> >>>> + ## Both file path and directory path are accepted.
> >>>> + "IgnoreFiles": []
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/CompilerPlugin
> >>>> + "CompilerPlugin": {
> >>>> + "DscPath": "IntelFsp2WrapperPkg.dsc"
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/HostUnitTestCompilerPlugin
> >>>> + "HostUnitTestCompilerPlugin": {
> >>>> + "DscPath": "" # Don't support this test
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/CharEncodingCheck
> >>>> + "CharEncodingCheck": {
> >>>> + "IgnoreFiles": []
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/DependencyCheck
> >>>> + "DependencyCheck": {
> >>>> + "AcceptableDependencies": [
> >>>> + "IntelFsp2Pkg/IntelFsp2Pkg.dec",
> >>>> + "IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec",
> >>>> + "MdeModulePkg/MdeModulePkg.dec",
> >>>> + "MdePkg/MdePkg.dec",
> >>>> + "SecurityPkg/SecurityPkg.dec",
> >>>> + "UefiCpuPkg/UefiCpuPkg.dec"
> >>>> + ],
> >>>> + # For host based unit tests
> >>>> + "AcceptableDependencies-HOST_APPLICATION":[
> >>>> + "UnitTestFrameworkPkg/UnitTestFrameworkPkg.dec"
> >>>> + ],
> >>>> + # For UEFI shell based apps
> >>>> + "AcceptableDependencies-UEFI_APPLICATION":[],
> >>>> + "IgnoreInf": []
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/DscCompleteCheck
> >>>> + "DscCompleteCheck": {
> >>>> + "IgnoreInf": [""],
> >>>> + "DscPath": "IntelFsp2WrapperPkg.dsc"
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/HostUnitTestDscCompleteCheck
> >>>> + "HostUnitTestDscCompleteCheck": {
> >>>> + "IgnoreInf": [""],
> >>>> + "DscPath": "" # Don't support this test
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/GuidCheck
> >>>> + "GuidCheck": {
> >>>> + "IgnoreGuidName": [],
> >>>> + "IgnoreGuidValue": [],
> >>>> + "IgnoreFoldersAndFiles": [],
> >>>> + "IgnoreDuplicates": [],
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/LibraryClassCheck
> >>>> + "LibraryClassCheck": {
> >>>> + "IgnoreLibraryClass": [
> >>>> + # This header file contains a small function in a
> >>>> + separate library so
> >> platforms
> >>>> + # do not have to override the whole main library instance.
> >>>> + "FspWrapperPlatformMultiPhaseLib"
> >>>> + ]
> >>>> + },
> >>>> +
> >>>> + ## options defined .pytool/Plugin/SpellCheck
> >>>> + "SpellCheck": {
> >>>> + "AuditOnly": True, # Fails right now with over 270 errors
> >>>> + "IgnoreFiles": [], # use gitignore syntax to ignore errors in
> >> matching files
> >>>> + "ExtendWords": [], # words to extend to the dictionary for this
> >> package
> >>>> + "IgnoreStandardPaths": [], # Standard Plugin defined paths that
> should
> >> be ignore
> >>>> + "AdditionalIncludePaths": [] # Additional paths to spell
> >>>> + check (wildcards
> >> supported)
> >>>> + }
> >>>> +}
> >>>> --
> >>>> 2.28.0.windows.1
> >>>>
> >>>>
> >>>>
> >>>> -=-=-=-=-=-=
> >>>> Groups.io Links: You receive all messages sent to this group.
> >>>> View/Reply Online (#93864):
> >>>> https://edk2.groups.io/g/devel/message/93864
> >>>> Mute This Topic: https://groups.io/mt/93707371/1643496
> >>>> Group Owner: devel+owner@edk2.groups.io
> >>>> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> >>>> [michael.d.kinney@intel.com] -=-=-=-=-=-=
> >>>>
> >>>
> >
> >
> >
> >
> >
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2022-10-05 3:59 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-15 18:55 [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 1/6] IntelFsp2Pkg: Fix code formatting errors Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 2/6] IntelFsp2Pkg/BaseFspMultiPhaseLib: Replace duplicate GUID Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 4/6] IntelFsp2WrapperPkg: Fix code formatting errors Michael Kubacki
2022-09-15 18:55 ` [PATCH v2 5/6] IntelFsp2WrapperPkg: Add CI YAML file Michael Kubacki
2022-10-04 16:01 ` [edk2-devel] " Michael D Kinney
2022-10-04 16:21 ` Michael Kubacki
2022-10-05 1:27 ` Chiu, Chasel
2022-10-05 3:08 ` Michael Kubacki
2022-10-05 3:59 ` Chiu, Chasel
2022-09-15 18:55 ` [PATCH v2 6/6] .azurepipelines: Add IntelFsp2Pkg and IntelFsp2WrapperPkg to CI Michael Kubacki
[not found] ` <17151D8FB6D820D9.18791@groups.io>
2022-09-15 19:41 ` [edk2-devel] [PATCH v2 3/6] IntelFsp2Pkg: Add CI YAML file Michael Kubacki
2022-09-23 1:07 ` Michael Kubacki
2022-10-03 14:44 ` Michael Kubacki
2022-10-03 18:46 ` Michael Kubacki
2022-10-04 16:02 ` [PATCH v2 0/6] Enable CI in Intel FSP Packages Michael D Kinney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox