diff options
Diffstat (limited to 'dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl/0001-CMakeLists-disable-Werror.patch | 38 | ||||
-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) | 55 |
2 files changed, 62 insertions, 31 deletions
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 @@ | |||
1 | From ef56be8e6bf2ea273cbeb960f3131164e7b517b6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 18 May 2022 12:24:03 +0800 | ||
4 | Subject: [PATCH] CMakeLists: disable Werror | ||
5 | |||
6 | gcc12 highlights minor warnings that cause the build to fail. Ignore | ||
7 | those until they aren't fixed upstream. | ||
8 | |||
9 | Upstream-Status: Inappropriate | ||
10 | |||
11 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
12 | --- | ||
13 | CMakeLists.txt | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
17 | index 418483f7..c019fea0 100644 | ||
18 | --- a/CMakeLists.txt | ||
19 | +++ b/CMakeLists.txt | ||
20 | @@ -146,7 +146,7 @@ else() | ||
21 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-strict-aliasing -D_FORTIFY_SOURCE=2") | ||
22 | if(LNX_BUILD) | ||
23 | #A few warnings yet to resolve under esx | ||
24 | - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") | ||
25 | + #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Werror") | ||
26 | set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Werror") | ||
27 | endif() | ||
28 | set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") | ||
29 | @@ -791,4 +791,4 @@ if(ESX_BUILD) | ||
30 | include(CMake/esx.cmake) | ||
31 | endif() | ||
32 | |||
33 | -add_subdirectory(src/os/nvm_api_sample) | ||
34 | \ No newline at end of file | ||
35 | +add_subdirectory(src/os/nvm_api_sample) | ||
36 | -- | ||
37 | 2.35.3 | ||
38 | |||
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 4a3b26c7..11305e83 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,56 +1,50 @@ | |||
1 | From cc0e412ad05574d22938586172c56863666eb2a5 Mon Sep 17 00:00:00 2001 | 1 | Subject: [PATCH] [PATCH]: ignore static asserts and null define for os and ut |
2 | From: Nolan Hergert <nolan.hergert@intel.com> | 2 | builds |
3 | Date: Mon, 5 Apr 2021 11:15:09 +0800 | 3 | Upstream-Status: Backport |
4 | Subject: [PATCH] Ignore STATIC_ASSERT and NULL definition so we can compile in | 4 | Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com> |
5 | OS | ||
6 | |||
7 | 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] | ||
8 | |||
9 | Signed-off-by: Nolan Hergert <nolan.hergert@intel.com> | ||
10 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> | ||
11 | --- | 5 | --- |
12 | MdePkg/Include/Base.h | 13 ++++++++++++- | 6 | MdePkg/Include/Base.h | 12 ++++++++++++ |
13 | 1 file changed, 12 insertions(+), 1 deletion(-) | 7 | 1 file changed, 12 insertions(+) |
14 | 8 | ||
15 | diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h | 9 | diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h |
16 | index 8e4271f6ea..c39511a064 100644 | 10 | index d209e6de28..6e61b8f3d3 100644 |
17 | --- a/MdePkg/Include/Base.h | 11 | --- a/MdePkg/Include/Base.h |
18 | +++ b/MdePkg/Include/Base.h | 12 | +++ b/MdePkg/Include/Base.h |
19 | @@ -318,7 +318,11 @@ struct _LIST_ENTRY { | 13 | @@ -316,8 +316,12 @@ struct _LIST_ENTRY { |
20 | /// | 14 | #define NULL __null |
21 | /// NULL pointer (VOID *) | 15 | #endif |
22 | /// | 16 | #else |
23 | +#ifndef OS_BUILD | 17 | +#ifndef OS_BUILD |
24 | +#ifndef UNIT_TEST_UEFI_BUILD | 18 | +#ifndef UNIT_TEST_UEFI_BUILD |
25 | #define NULL ((VOID *) 0) | 19 | #define NULL ((VOID *) 0) |
20 | #endif | ||
26 | +#endif | 21 | +#endif |
27 | +#endif | 22 | +#endif |
28 | 23 | ||
29 | // | 24 | // |
30 | // Null character | 25 | // Null character |
31 | @@ -809,7 +813,8 @@ typedef UINTN *BASE_LIST; | 26 | @@ -779,6 +783,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. | 27 | // Section 2.3.1 of the UEFI 2.3 Specification. |
34 | // | 28 | // |
35 | - | 29 | |
36 | +#ifndef OS_BUILD | 30 | +#ifndef OS_BUILD |
37 | +#ifndef UNIT_TEST_UEFI_BUILD | 31 | +#ifndef UNIT_TEST_UEFI_BUILD |
38 | STATIC_ASSERT (sizeof (BOOLEAN) == 1, "sizeof (BOOLEAN) does not meet UEFI Specification Data Type requirements"); | 32 | 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"); | 33 | 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"); | 34 | 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 | 35 | @@ -792,6 +798,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"); | 36 | STATIC_ASSERT (sizeof (CHAR16) == 2, "sizeof (CHAR16) does not meet UEFI Specification Data Type requirements"); |
37 | STATIC_ASSERT (sizeof (L'A') == 2, "sizeof (L'A') does not meet UEFI Specification Data Type requirements"); | ||
38 | STATIC_ASSERT (sizeof (L"A") == 4, "sizeof (L\"A\") does not meet UEFI Specification Data Type requirements"); | ||
45 | +#endif | 39 | +#endif |
46 | +#endif | 40 | +#endif |
47 | 41 | ||
48 | // | 42 | // |
49 | // The following three enum types are used to verify that the compiler | 43 | // The following three enum types are used to verify that the compiler |
50 | @@ -841,9 +848,13 @@ typedef enum { | 44 | @@ -812,9 +820,13 @@ typedef enum { |
51 | __VerifyUint32EnumValue = 0xffffffff | 45 | __VerifyUint32EnumValue = 0xffffffff |
52 | } __VERIFY_UINT32_ENUM_SIZE; | 46 | } __VERIFY_UINT32_ENUM_SIZE; |
53 | 47 | ||
54 | +#ifndef OS_BUILD | 48 | +#ifndef OS_BUILD |
55 | +#ifndef UNIT_TEST_UEFI_BUILD | 49 | +#ifndef UNIT_TEST_UEFI_BUILD |
56 | STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 50 | STATIC_ASSERT (sizeof (__VERIFY_UINT8_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
@@ -58,9 +52,8 @@ index 8e4271f6ea..c39511a064 100644 | |||
58 | STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); | 52 | STATIC_ASSERT (sizeof (__VERIFY_UINT32_ENUM_SIZE) == 4, "Size of enum does not meet UEFI Specification Data Type requirements"); |
59 | +#endif | 53 | +#endif |
60 | +#endif | 54 | +#endif |
61 | 55 | ||
62 | /** | 56 | /** |
63 | Macro that returns a pointer to the data structure that contains a specified field of | 57 | Macro that returns a pointer to the data structure that contains a specified field of |
64 | -- | 58 | -- |
65 | 2.17.1 | 59 | 2.37.3 |
66 | |||