From 53f7601588a5293e291d2ce25598eb5423296b43 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 18 May 2022 12:27:22 +0800 Subject: ipmctl : upgrade 03.00.00.0438 -> 03.00.00.0485 Refresh patches and switch to using master branch. Signed-off-by: Anuj Mittal --- .../ipmctl/0001-CMakeLists-disable-Werror.patch | 38 ++++++++++++++++++ ...ERTs-and-NULL-define-for-os-and-ut-builds.patch | 38 +++++++++--------- .../recipes-support/ipmctl/ipmctl_03.00.00.0438.bb | 45 --------------------- .../recipes-support/ipmctl/ipmctl_03.00.00.0485.bb | 46 ++++++++++++++++++++++ 4 files changed, 104 insertions(+), 63 deletions(-) create mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0438.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch new file mode 100644 index 00000000..4474aa3c --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch @@ -0,0 +1,38 @@ +From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +Date: Wed, 18 May 2022 12:24:03 +0800 +Subject: [PATCH] CMakeLists: disable Werror + +gcc12 highlights minor warnings that cause the build to fail. Ignore +those until they aren't fixed upstream. + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 418483f7..c019fea0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -146,7 +146,7 @@ else() + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2") + if(LNX_BUILD) + #A few warnings yet to resolve under esx +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") ++ #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror") + endif() + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") +@@ -791,4 +791,4 @@ if(ESX_BUILD) + include(CMake/esx.cmake) + endif() + +-add_subdirectory(src/os/nvm_api_sample) +\ No newline at end of file ++add_subdirectory(src/os/nvm_api_sample) +-- +2.35.3 + 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 - +Signed-off-by: Teoh Suh Haw +--- 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.0438.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0438.bb deleted file mode 100644 index 4b4d5115..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0438.bb +++ /dev/null @@ -1,45 +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;branch=master \ - file://0001-Ignore-STATIC_ASSERTs-and-NULL-define-for-os-and-ut-builds.patch;patchdir=edk2 \ -" - -SRCREV_ipmctl = "99188a69a82409f6759e8bfdff8fd71840e851fc" -#tag: edk2-stable202111 -SRCREV_edk2 = "bb1bba3d776733c41dbfa2d1dc0fe234819a79f2" - -S = "${WORKDIR}/git" - -inherit cmake dos2unix - -DEPENDS = "ndctl pkgconfig-native" - -EXTRA_OECMAKE = "-DRELEASE=ON" - -do_configure:prepend() { - for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do - ln -sf edk2/${dir} ${S} - done -} - -do_install:append() { - # Remove /var/log/ipmctl as anything created in /var/log will not be - # available when tmpfs is mounted at /var/volatile/log. - rm -rf ${D}${localstatedir}/log -} diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb new file mode 100644 index 00000000..bc747ae8 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0485.bb @@ -0,0 +1,46 @@ +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=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 = "c75bd840ea7820c8f93a5488fcff75d08beedd51" +#tag edk2-stable202302 +SRCREV_edk2 = "f80f052277c88a67c55e107b550f504eeea947d3" + +S = "${WORKDIR}/git" + +inherit cmake dos2unix + +DEPENDS = "ndctl pkgconfig-native" + +EXTRA_OECMAKE = "-DRELEASE=ON" + +do_configure:prepend() { + for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do + ln -sf edk2/${dir} ${S} + done +} + +do_install:append() { + # Remove /var/log/ipmctl as anything created in /var/log will not be + # available when tmpfs is mounted at /var/volatile/log. + rm -rf ${D}${localstatedir}/log +} -- cgit v1.2.3-54-g00ecf