summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2021-10-11 15:04:44 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2021-10-11 16:40:55 (GMT)
commita904c13e7e75b2bd9ed5c74f877b215027ce7442 (patch)
tree1e856c6303634e078334ca445beda87a9705c1ce
parent8cd5f2a621535e57882fe70ffa46b3166c299332 (diff)
downloadmeta-intel-a904c13e7e75b2bd9ed5c74f877b215027ce7442.tar.gz
ipmctl: upgrade 03.00.00.0369 -> 03.00.00.0387
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch (renamed from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch)33
-rw-r--r--dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb (renamed from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0369.bb)8
2 files changed, 16 insertions, 25 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
index 4a3b26c..7fede93 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch
@@ -1,19 +1,12 @@
1From cc0e412ad05574d22938586172c56863666eb2a5 Mon Sep 17 00:00:00 2001
2From: Nolan Hergert <nolan.hergert@intel.com>
3Date: Mon, 5 Apr 2021 11:15:09 +0800
4Subject: [PATCH] Ignore STATIC_ASSERT and NULL definition so we can compile in
5 OS
6 1
7Upstream-Status: Backport [from ipmctl patches; https://github.com/intel/ipmctl/blob/development/src/os/patches/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch] 2Upstream-Status: Backport
3Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
8 4
9Signed-off-by: Nolan Hergert <nolan.hergert@intel.com> 5 MdePkg/Include/Base.h | 12 ++++++++++++
10Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> 6 1 file changed, 12 insertions(+)
11---
12 MdePkg/Include/Base.h | 13 ++++++++++++-
13 1 file changed, 12 insertions(+), 1 deletion(-)
14 7
15diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h 8diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h
16index 8e4271f6ea..c39511a064 100644 9index 2da08b0c78..072eefdb94 100644
17--- a/MdePkg/Include/Base.h 10--- a/MdePkg/Include/Base.h
18+++ b/MdePkg/Include/Base.h 11+++ b/MdePkg/Include/Base.h
19@@ -318,7 +318,11 @@ struct _LIST_ENTRY { 12@@ -318,7 +318,11 @@ struct _LIST_ENTRY {
@@ -28,26 +21,25 @@ index 8e4271f6ea..c39511a064 100644
28 21
29 // 22 //
30 // Null character 23 // Null character
31@@ -809,7 +813,8 @@ typedef UINTN *BASE_LIST; 24@@ -810,6 +814,8 @@ typedef UINTN *BASE_LIST;
32 // Verify that ProcessorBind.h produced UEFI Data Types that are compliant with
33 // Section 2.3.1 of the UEFI 2.3 Specification. 25 // Section 2.3.1 of the UEFI 2.3 Specification.
34 // 26 //
35- 27
36+#ifndef OS_BUILD 28+#ifndef OS_BUILD
37+#ifndef UNIT_TEST_UEFI_BUILD 29+#ifndef UNIT_TEST_UEFI_BUILD
38 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); 30 STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements");
39 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements"); 31 STATIC_ASSERT (sizeof (INT8) == 1, "sizeof (INT8) does not meet UEFI Specification Data Type requirements");
40 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements"); 32 STATIC_ASSERT (sizeof (UINT8) == 1, "sizeof (UINT8) does not meet UEFI Specification Data Type requirements");
41@@ -821,6 +826,8 @@ STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specifi 33@@ -823,6 +829,8 @@ STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specifi
42 STATIC_ASSERT (sizeof (UINT64) == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements");
43 STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements");
44 STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); 34 STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements");
35 STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements");
36 STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements");
45+#endif 37+#endif
46+#endif 38+#endif
47 39
48 // 40 //
49 // The following three enum types are used to verify that the compiler 41 // The following three enum types are used to verify that the compiler
50@@ -841,9 +848,13 @@ typedef enum { 42@@ -843,9 +851,13 @@ typedef enum {
51 __VerifyUint32EnumValue = 0xffffffff 43 __VerifyUint32EnumValue = 0xffffffff
52 } __VERIFY_UINT32_ENUM_SIZE; 44 } __VERIFY_UINT32_ENUM_SIZE;
53 45
@@ -62,5 +54,4 @@ index 8e4271f6ea..c39511a064 100644
62 /** 54 /**
63 Macro that returns a pointer to the data structure that contains a specified field of 55 Macro that returns a pointer to the data structure that contains a specified field of
64-- 56--
652.17.1 572.31.0.windows.1
66
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0369.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb
index 48140a6..411c45a 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0369.bb
+++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb
@@ -17,12 +17,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=72b9da60da6219d612ce30b746a0fe71 \
17 17
18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ 18SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \
19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \ 19 git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \
20 file://0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch;patchdir=edk2 \ 20 file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \
21" 21"
22 22
23SRCREV_ipmctl = "b7541dfeeca1cfdd9f9c9551d7039d3e9809245d" 23SRCREV_ipmctl = "3cbc9f7f231f6f03895e0ff8ab797d22075e09b7"
24#tag: edk2-stable202102 24#tag: edk2-stable202108
25SRCREV_edk2 = "ef91b07388e1c0a50c604e5350eeda98428ccea6" 25SRCREV_edk2 = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
26 26
27S = "${WORKDIR}/git" 27S = "${WORKDIR}/git"
28 28