summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch48
-rw-r--r--meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb (renamed from meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb)5
2 files changed, 2 insertions, 51 deletions
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch
deleted file mode 100644
index 43e905f33a..0000000000
--- a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch
+++ /dev/null
@@ -1,48 +0,0 @@
1From 3018aa9822c680663ebd19542bcd757dc9baf20a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 8 Sep 2024 20:16:49 -0700
4Subject: [PATCH] Fix undeclared function errors
5
6e.g.
7
8ipmi-sel-string-supermicro-x10dimm-common.c:87:14: error: call to undeclared function 'sel_string_output_supermicro_dimm_event_d
9 | 87 | if ((ret = sel_string_output_supermicro_dimm_event_data2_event_data3 (ctx,
10
11Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2024-09/msg00001.html]
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 ipmi-sensors/ipmi-sensors-oem-intel.c | 1 +
16 libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 9 +++++++++
17 2 files changed, 10 insertions(+)
18
19diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c
20index 5e0f373..872a730 100644
21--- a/ipmi-sensors/ipmi-sensors-oem-intel.c
22+++ b/ipmi-sensors/ipmi-sensors-oem-intel.c
23@@ -36,6 +36,7 @@
24 #include "ipmi-sensors-oem-intel-s2600jf.h"
25 #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h"
26 #include "ipmi-sensors-oem-intel-node-manager.h"
27+#include "ipmi-sensors-oem-intel-s2600wp.h"
28
29 #include "freeipmi-portability.h"
30 #include "pstdout.h"
31diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h
32index 5785f2b..9e29bd6 100644
33--- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h
34+++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h
35@@ -39,4 +39,13 @@ int sel_string_output_supermicro_overheat_event_data1_class_oem (ipmi_sel_ctx_t
36 unsigned int *wlen,
37 struct ipmi_sel_system_event_record_data *system_event_record_data);
38
39+int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx,
40+ struct ipmi_sel_entry *sel_entry,
41+ uint8_t sel_record_type,
42+ char *buf,
43+ unsigned int buflen,
44+ unsigned int flags,
45+ unsigned int *wlen,
46+ struct ipmi_sel_system_event_record_data *system_event_record_data,
47+ int *oem_rv);
48 #endif /* IPMI_SEL_STRING_SUPERMICRO_COMMON_H */
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
index e9b28cee38..e977bbcd9e 100644
--- a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb
+++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
@@ -13,9 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
13 file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \ 13 file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \
14 file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb" 14 file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb"
15 15
16SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \ 16SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz"
17 file://0001-Fix-undeclared-function-errors.patch" 17SRC_URI[sha256sum] = "d6929c354639f5ce75b5b1897e8b366eb63625c23e5c4590a7aea034fe2b8caf"
18SRC_URI[sha256sum] = "1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5"
19 18
20DEPENDS = "libgcrypt" 19DEPENDS = "libgcrypt"
21DEPENDS:append:libc-musl = " argp-standalone" 20DEPENDS:append:libc-musl = " argp-standalone"