Signed-off-by: Anuj Mittal <[email protected]> --- ...nd-NULL-define-for-os-and-ut-builds.patch} | 33 +++++++------------ ....00.00.0369.bb => ipmctl_03.00.00.0387.bb} | 8 ++--- 2 files changed, 16 insertions(+), 25 deletions(-) rename dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/{0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch => 0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch} (59%) rename dynamic-layers/openembedded-layer/recipes-support/ipmctl/{ipmctl_03.00.00.0369.bb => ipmctl_03.00.00.0387.bb} (82%)
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 similarity index 59% rename from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch rename to dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch index 4a3b26c7..7fede93c 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 @@ -From cc0e412ad05574d22938586172c56863666eb2a5 Mon Sep 17 00:00:00 2001 -From: Nolan Hergert <[email protected]> -Date: Mon, 5 Apr 2021 11:15:09 +0800 -Subject: [PATCH] Ignore STATIC_ASSERT and NULL definition so we can compile in - OS -Upstream-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] +Upstream-Status: Backport +Signed-off-by: Anuj Mittal <[email protected]> -Signed-off-by: Nolan Hergert <[email protected]> -Signed-off-by: Naveen Saini <[email protected]> ---- - MdePkg/Include/Base.h | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) + MdePkg/Include/Base.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h -index 8e4271f6ea..c39511a064 100644 +index 2da08b0c78..072eefdb94 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -318,7 +318,11 @@ struct _LIST_ENTRY { @@ -28,26 +21,25 @@ index 8e4271f6ea..c39511a064 100644 // // Null character -@@ -809,7 +813,8 @@ typedef UINTN *BASE_LIST; - // Verify that ProcessorBind.h produced UEFI Data Types that are compliant with +@@ -810,6 +814,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"); -@@ -821,6 +826,8 @@ STATIC_ASSERT (sizeof (INT64) == 8, "sizeof (INT64) does not meet UEFI Specifi - STATIC_ASSERT (sizeof (UINT64) == 8, "sizeof (UINT64) does not meet UEFI Specification Data Type requirements"); - STATIC_ASSERT (sizeof (CHAR8) == 1, "sizeof (CHAR8) does not meet UEFI Specification Data Type requirements"); +@@ -823,6 +829,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 -@@ -841,9 +848,13 @@ typedef enum { +@@ -843,9 +851,13 @@ typedef enum { __VerifyUint32EnumValue = 0xffffffff } __VERIFY_UINT32_ENUM_SIZE; @@ -62,5 +54,4 @@ index 8e4271f6ea..c39511a064 100644 /** Macro that returns a pointer to the data structure that contains a specified field of -- -2.17.1 - +2.31.0.windows.1 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 similarity index 82% rename from dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0369.bb rename to dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb index 48140a65..411c45ad 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 \ SRC_URI = "git://github.com/intel/ipmctl.git;protocol=https;branch=development;name=ipmctl; \ git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \ - file://0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch;patchdir=edk2 \ + file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ " -SRCREV_ipmctl = "b7541dfeeca1cfdd9f9c9551d7039d3e9809245d" -#tag: edk2-stable202102 -SRCREV_edk2 = "ef91b07388e1c0a50c604e5350eeda98428ccea6" +SRCREV_ipmctl = "3cbc9f7f231f6f03895e0ff8ab797d22075e09b7" +#tag: edk2-stable202108 +SRCREV_edk2 = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" S = "${WORKDIR}/git" -- 2.31.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7295): https://lists.yoctoproject.org/g/meta-intel/message/7295 Mute This Topic: https://lists.yoctoproject.org/mt/86240367/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
