ipmctl : upgrade 03.00.00.0468 -> 03.00.00.0483

Release Notes:
ipmctl:
https://github.com/intel/ipmctl/releases/tag/v03.00.00.0483
edk2:
https://github.com/tianocore/edk2/releases/tag/edk2-stable202302

Adapt patch for edk2 202302 release

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

2 files changed, 24 insertions, 22 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
index 7fede93c..11305e83 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -1,48 +1,50 @@
-
+Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut
+ builds
 Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
+Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>
+---
  MdePkg/Include/Base.h | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
 diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
-index 2da08b0c78..072eefdb94 100644
+index d209e6de28..6e61b8f3d3 100644
 --- a/MdePkg/Include/Base.h
 +++ b/MdePkg/Include/Base.h
-@@ -318,7 +318,11 @@ struct _LIST_ENTRY {
- ///
- /// NULL pointer (VOID *)
- ///
+@@ -316,8 +316,12 @@ struct _LIST_ENTRY {
+ #define NULL  __null
+   #endif
+ #else
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
  #define NULL  ((VOID *) 0)
+ #endif
 +#endif
 +#endif
- 
+
  //
  // Null character
-@@ -810,6 +814,8 @@ typedef UINTN  *BASE_LIST;
+@@ -779,6 +783,8 @@ typedef UINTN *BASE_LIST;
  // Section 2.3.1 of the UEFI 2.3 Specification.
  //
- 
+
 +#ifndef OS_BUILD
 +#ifndef UNIT_TEST_UEFI_BUILD
  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 (UINT8)   == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
-@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
+@@ -792,6 +798,8 @@ STATIC_ASSERT (sizeof (CHAR8)   == 1, "sizeof (CHAR8) does not meet UEFI Specifi
  STATIC_ASSERT (sizeof (CHAR16)  == 2, "sizeof (CHAR16) 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 (sizeof (L"A")    == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
- 
+
  //
  // The following three enum types are used to verify that the compiler
-@@ -843,9 +851,13 @@ typedef enum {
+@@ -812,9 +820,13 @@ typedef enum {
    __VerifyUint32EnumValue = 0xffffffff
  } __VERIFY_UINT32_ENUM_SIZE;
- 
+
 +#ifndef OS_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");
@@ -50,8 +52,8 @@ index 2da08b0c78..072eefdb94 100644
  STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements");
 +#endif
 +#endif
- 
+
  /**
    Macro that returns a pointer to the data structure that contains a specified field of
--- 
-2.31.0.windows.1
+--
+2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0468.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0483.bb
index f38a64c3..f2b1b5ed 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0468.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0483.bb
@@ -15,15 +15,15 @@ LICENSE = "BSD-3-Clause | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71  \
                     file://edk2/License.txt;md5=6123e5bf044a66db96c4ce88a36b2d08"
 
-SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \
+SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=master;name=ipmctl; \
         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-CMakeLists-disable-Werror.patch \
 "
 
-SRCREV_ipmctl = "cd3bd60f84cb7167fa81257bd33db90fa1f5a70b"
-#tag edk2-stable202208
-SRCREV_edk2 = "ba0e0e4c6a174b71b18ccd6e47319cc45878893c"
+SRCREV_ipmctl = "eca59dc53741c7f9d0ac5320ef790a1932a9a499"
+#tag edk2-stable202302
+SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3"
 
 S = "${WORKDIR}/git"