From a904c13e7e75b2bd9ed5c74f877b215027ce7442 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Mon, 11 Oct 2021 23:04:44 +0800 Subject: ipmctl: upgrade 03.00.00.0369 -> 03.00.00.0387 Signed-off-by: Anuj Mittal --- ...IC_ASSERT-and-NULL-definition-so-we-can-c.patch | 66 ---------------------- ...ERTs-and-NULL-define-for-os-and-ut-builds.patch | 57 +++++++++++++++++++ .../recipes-support/ipmctl/ipmctl_03.00.00.0369.bb | 39 ------------- .../recipes-support/ipmctl/ipmctl_03.00.00.0387.bb | 39 +++++++++++++ 4 files changed, 96 insertions(+), 105 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch create mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0369.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb 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_ASSERT-and-NULL-definition-so-we-can-c.patch deleted file mode 100644 index 4a3b26c7..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERT-and-NULL-definition-so-we-can-c.patch +++ /dev/null @@ -1,66 +0,0 @@ -From cc0e412ad05574d22938586172c56863666eb2a5 Mon Sep 17 00:00:00 2001 -From: Nolan Hergert -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] - -Signed-off-by: Nolan Hergert -Signed-off-by: Naveen Saini ---- - MdePkg/Include/Base.h | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h -index 8e4271f6ea..c39511a064 100644 ---- a/MdePkg/Include/Base.h -+++ b/MdePkg/Include/Base.h -@@ -318,7 +318,11 @@ struct _LIST_ENTRY { - /// - /// NULL pointer (VOID *) - /// -+#ifndef OS_BUILD -+#ifndef UNIT_TEST_UEFI_BUILD - #define NULL ((VOID *) 0) -+#endif -+#endif - - // - // Null character -@@ -809,7 +813,8 @@ typedef UINTN *BASE_LIST; - // Verify that ProcessorBind.h produced UEFI Data Types that are compliant with - // 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"); - STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) 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 { - __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"); - 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"); -+#endif -+#endif - - /** - Macro that returns a pointer to the data structure that contains a specified field of --- -2.17.1 - 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 new file mode 100644 index 00000000..7fede93c --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch @@ -0,0 +1,57 @@ + +Upstream-Status: Backport +Signed-off-by: Anuj Mittal + + 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 +--- a/MdePkg/Include/Base.h ++++ b/MdePkg/Include/Base.h +@@ -318,7 +318,11 @@ struct _LIST_ENTRY { + /// + /// NULL pointer (VOID *) + /// ++#ifndef OS_BUILD ++#ifndef UNIT_TEST_UEFI_BUILD + #define NULL ((VOID *) 0) ++#endif ++#endif + + // + // Null character +@@ -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"); +@@ -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 +@@ -843,9 +851,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"); + 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"); ++#endif ++#endif + + /** + Macro that returns a pointer to the data structure that contains a specified field of +-- +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.0369.bb deleted file mode 100644 index 48140a65..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0369.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Utility for managing Intel Optane DC persistent memory modules" -DESCRIPTION = "Utility for configuring and managing Intel Optane Persistent \ -Memory modules (PMem). It supports functionality to: \ -Discover DCPMMs on the platform. \ -Provision the platform memory configuration. \ -View and update the firmware on DCPMMs. \ -Configure data-at-rest security on DCPMMs. \ -Track health and performance of DCPMMs. \ -Debug and troubleshoot DCPMMs." - -HOMEPAGE = "https://github.com/intel/ipmctl" -BUGTRACKER = "https://github.com/intel/ipmctl/issues" - -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; \ - 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 \ -" - -SRCREV_ipmctl = "b7541dfeeca1cfdd9f9c9551d7039d3e9809245d" -#tag: edk2-stable202102 -SRCREV_edk2 = "ef91b07388e1c0a50c604e5350eeda98428ccea6" - -S = "${WORKDIR}/git" - -inherit cmake dos2unix - -DEPENDS = "ndctl" - -EXTRA_OECMAKE = "-DRELEASE=ON" - -do_configure:prepend() { - for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do - ln -sf edk2/${dir} ${S} - done -} diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb new file mode 100644 index 00000000..411c45ad --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0387.bb @@ -0,0 +1,39 @@ +SUMMARY = "Utility for managing Intel Optane DC persistent memory modules" +DESCRIPTION = "Utility for configuring and managing Intel Optane Persistent \ +Memory modules (PMem). It supports functionality to: \ +Discover DCPMMs on the platform. \ +Provision the platform memory configuration. \ +View and update the firmware on DCPMMs. \ +Configure data-at-rest security on DCPMMs. \ +Track health and performance of DCPMMs. \ +Debug and troubleshoot DCPMMs." + +HOMEPAGE = "https://github.com/intel/ipmctl" +BUGTRACKER = "https://github.com/intel/ipmctl/issues" + +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; \ + git://github.com/tianocore/edk2.git;protocol=https;name=edk2;destsuffix=git/edk2; \ + file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ +" + +SRCREV_ipmctl = "3cbc9f7f231f6f03895e0ff8ab797d22075e09b7" +#tag: edk2-stable202108 +SRCREV_edk2 = "7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5" + +S = "${WORKDIR}/git" + +inherit cmake dos2unix + +DEPENDS = "ndctl" + +EXTRA_OECMAKE = "-DRELEASE=ON" + +do_configure:prepend() { + for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do + ln -sf edk2/${dir} ${S} + done +} -- cgit v1.2.3-54-g00ecf