diff mbox series

[meta-oe,05/32] freeipmi: update 1.6.14 -> 1.6.15

Message ID 1737360846-4824-5-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/32] cbindgen: update 0.27.0 -> 0.28.0 | expand

Commit Message

Mingyu Wang (Fujitsu) Jan. 20, 2025, 8:13 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-undeclared-function-errors.patch
removed since it's included in 1.6.15

Changelog:
==========
- In ipmi-config, fix incorrect output of IPv6_Dynamic_Address_Source_Type.
- In ipmi-oem, increase precision of Dell cumulative energy output.
- Do not advertise options that are only available when special debugging
  is compiled into FreeIPMI.
- Fix build errors with implicit-function-declaration.
- libfreeipmi: remove unnecessary / duplicate parameter checks.
- Fix gcc 14.x build failures.
- Minor documentation updates.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../0001-Fix-undeclared-function-errors.patch | 48 -------------------
 ...{freeipmi_1.6.14.bb => freeipmi_1.6.15.bb} |  5 +-
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch
 rename meta-oe/recipes-support/freeipmi/{freeipmi_1.6.14.bb => freeipmi_1.6.15.bb} (85%)
diff mbox series

Patch

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 @@ 
-From 3018aa9822c680663ebd19542bcd757dc9baf20a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 8 Sep 2024 20:16:49 -0700
-Subject: [PATCH] Fix undeclared function errors
-
-e.g.
-
-ipmi-sel-string-supermicro-x10dimm-common.c:87:14: error: call to undeclared function 'sel_string_output_supermicro_dimm_event_d
-    |    87 |   if ((ret = sel_string_output_supermicro_dimm_event_data2_event_data3 (ctx,
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2024-09/msg00001.html]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- ipmi-sensors/ipmi-sensors-oem-intel.c               | 1 +
- libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 9 +++++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c
-index 5e0f373..872a730 100644
---- a/ipmi-sensors/ipmi-sensors-oem-intel.c
-+++ b/ipmi-sensors/ipmi-sensors-oem-intel.c
-@@ -36,6 +36,7 @@
- #include "ipmi-sensors-oem-intel-s2600jf.h"
- #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h"
- #include "ipmi-sensors-oem-intel-node-manager.h"
-+#include "ipmi-sensors-oem-intel-s2600wp.h"
- 
- #include "freeipmi-portability.h"
- #include "pstdout.h"
-diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h
-index 5785f2b..9e29bd6 100644
---- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h
-+++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h
-@@ -39,4 +39,13 @@ int sel_string_output_supermicro_overheat_event_data1_class_oem (ipmi_sel_ctx_t
-                                                                  unsigned int *wlen,
-                                                                  struct ipmi_sel_system_event_record_data *system_event_record_data);
- 
-+int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx,
-+                                                               struct ipmi_sel_entry *sel_entry,
-+                                                               uint8_t sel_record_type,
-+                                                               char *buf,
-+                                                               unsigned int buflen,
-+                                                               unsigned int flags,
-+                                                               unsigned int *wlen,
-+                                                               struct ipmi_sel_system_event_record_data *system_event_record_data,
-+                                                               int *oem_rv);
- #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
similarity index 85%
rename from meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb
rename to 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 \
                     file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \
                     file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb"
 
-SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \
-           file://0001-Fix-undeclared-function-errors.patch"
-SRC_URI[sha256sum] = "1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5"
+SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz"
+SRC_URI[sha256sum] = "d6929c354639f5ce75b5b1897e8b366eb63625c23e5c4590a7aea034fe2b8caf"
 
 DEPENDS = "libgcrypt"
 DEPENDS:append:libc-musl = " argp-standalone"