ipmctl : upgrade 03.00.00.0485 -> 03.00.00.0499

Refresh patch 0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch

Release Notes:
ipmctl:
https://github.com/intel/ipmctl/releases/tag/v03.00.00.0499

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Yogesh Tyagi 2024-10-22 15:07:25 +05:30 committed by Anuj Mittal
parent 51cc236453
commit 7d826adfe7
No known key found for this signature in database
GPG Key ID: B749E1556041E1B2
2 changed files with 27 additions and 24 deletions

View File

@ -6,10 +6,10 @@ Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
MdePkg/Include/Base.h | 12 ++++++++++++ MdePkg/Include/Base.h | 12 ++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h Index: edk2/MdePkg/Include/Base.h
index d209e6de28..6e61b8f3d3 100644 ===================================================================
--- a/MdePkg/Include/Base.h --- edk2.orig/MdePkg/Include/Base.h
+++ b/MdePkg/Include/Base.h +++ edk2/MdePkg/Include/Base.h
@@ -316,8 +316,12 @@ struct _LIST_ENTRY { @@ -316,8 +316,12 @@ struct _LIST_ENTRY {
#define NULL __null #define NULL __null
#endif #endif
@ -23,7 +23,7 @@ index d209e6de28..6e61b8f3d3 100644
// //
// Null character // Null character
@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST; @@ -813,6 +817,8 @@ typedef UINTN *BASE_LIST;
// Section 2.3.1 of the UEFI 2.3 Specification. // Section 2.3.1 of the UEFI 2.3 Specification.
// //
@ -32,28 +32,31 @@ index d209e6de28..6e61b8f3d3 100644
STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi @@ -841,7 +847,8 @@ STATIC_ASSERT (ALIGNOF (CHAR16) == size
STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (INTN) == sizeof (INTN), "Alignment of INTN does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (UINTN) == sizeof (UINTN), "Alignment of UINTN does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (ALIGNOF (VOID *) == sizeof (VOID *), "Alignment of VOID * does not meet UEFI Specification Data Type requirements");
-
+#endif +#endif
+#endif +#endif
// //
// The following three enum types are used to verify that the compiler // The following three enum types are used to verify that the compiler
@@ -812,9 +820,13 @@ typedef enum { // configuration for enum types is compliant with Section 2.3.1 of the
__VerifyUint32EnumValue = 0xffffffff @@ -861,6 +868,8 @@ typedef enum {
} __VERIFY_UINT32_ENUM_SIZE; __VerifyInt32EnumValue = 0x7fffffff
} __VERIFY_INT32_ENUM_SIZE;
+#ifndef OS_BUILD +#ifndef OS_BUILD
+#ifndef UNIT_TEST_UEFI_BUILD +#ifndef UNIT_TEST_UEFI_BUILD
STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (__VERIFY_UINT16_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); STATIC_ASSERT (sizeof (__VERIFY_INT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
@@ -868,6 +877,8 @@ STATIC_ASSERT (sizeof (__VERIFY_INT32_EN
STATIC_ASSERT (ALIGNOF (__VERIFY_UINT8_ENUM_SIZE) == sizeof (__VERIFY_UINT8_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (ALIGNOF (__VERIFY_UINT16_ENUM_SIZE) == sizeof (__VERIFY_UINT16_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
STATIC_ASSERT (ALIGNOF (__VERIFY_INT32_ENUM_SIZE) == sizeof (__VERIFY_INT32_ENUM_SIZE), "Alignment of enum does not meet UEFI Specification Data Type requirements");
+#endif +#endif
+#endif +#endif
/** /**
Macro that returns a pointer to the data structure that contains a specified field of Macro that returns a pointer to the data structure that contains a specified field of
--
2.37.3

View File

@ -15,15 +15,15 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \ LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \
file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08" file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \ SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master_3_0;name=ipmctl; \
git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \ git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2;branch=master \
file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
file://0001-CMakeLists-disable-Werror.patch \ file://0001-CMakeLists-disable-Werror.patch \
" "
SRCREV_ipmctl = "c75bd840ea7820c8f93a5488fcff75d08beedd51" SRCREV_ipmctl = "a71f2fb1c90dd07f9862b71c789881132193e8f9"
#tag edk2-stable202302 #tag edk2-stable202408
SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3" SRCREV_edk2 = "b158dad150bf02879668f72ce306445250838201"
SRCREV_FORMAT = "ipmctl_edk2" SRCREV_FORMAT = "ipmctl_edk2"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"