From 086b60705442789601a5041325095f37140cb663 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 6 Oct 2025 18:49:55 +0200 Subject: [PATCH] package/freeipmi: bump to version 1.6.16 Removes the patches since they are all integrated upstream. Release notes: https://lists.gnu.org/archive/html/freeipmi-announce/2025-01/msg00000.html https://lists.gnu.org/archive/html/freeipmi-announce/2025-09/msg00000.html Signed-off-by: Dario Binacchi Signed-off-by: Julien Olivain (cherry picked from commit b4a52c203c4bfc3f3a26dc19fe19533647229fd9) Signed-off-by: Thomas Perale --- ...ipmi-sel-string-supermicro-common.h-.patch | 36 ------------ ...sensors-fix-header-guard-definitions.patch | 57 ------------------- ...003-ipmi-sensors-add-missing-include.patch | 28 --------- package/freeipmi/freeipmi.hash | 2 +- package/freeipmi/freeipmi.mk | 2 +- 5 files changed, 2 insertions(+), 123 deletions(-) delete mode 100644 package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch delete mode 100644 package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch delete mode 100644 package/freeipmi/0003-ipmi-sensors-add-missing-include.patch diff --git a/package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch b/package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch deleted file mode 100644 index 848539e7c3..0000000000 --- a/package/freeipmi/0001-libfreeipmi-sel-ipmi-sel-string-supermicro-common.h-.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9239a686e4bfd862145f4654017112a0f8cbbb0d Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Fri, 22 Mar 2024 21:07:28 -0700 -Subject: [PATCH] libfreeipmi/sel/ipmi-sel-string-supermicro-common.h: Add - missing function prototype. - -Signed-off-by: Albert Chu -[Waldemar: removed Changelog patching] -Signed-off-by: Waldemar Brodkorb -Upstream: http://git.savannah.gnu.org/cgit/freeipmi.git/commit/?h=freeipmi-1-6-0-stable&id=9239a686e4bfd862145f4654017112a0f8cbbb0d ---- - libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 10 ++++++++++ - 1 files changed, 15 insertions(+) - -diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h -index 5785f2b64..be5e41d7d 100644 ---- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h -+++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h -@@ -39,4 +39,14 @@ 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 */ --- -2.30.2 - diff --git a/package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch b/package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch deleted file mode 100644 index b04b305835..0000000000 --- a/package/freeipmi/0002-ipmi-sensors-fix-header-guard-definitions.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c3d1a3f5c550940577076ce2c4595b470ae963c3 Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Sun, 24 Mar 2024 13:11:55 -0700 -Subject: [PATCH] ipmi-sensors: fix header guard definitions - -Signed-off-by: Albert Chu -[Waldemar: removed Changelog patching] -Signed-off-by: Waldemar Brodkorb -Upstream: https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?h=freeipmi-1-6-0-stable&id=c3d1a3f5c550940577076ce2c4595b470ae963c3 ---- - ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h | 2 +- - ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h | 2 +- - ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h | 2 +- - 3 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h b/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h -index 0b11e61ce..4ae808cda 100644 ---- a/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h -+++ b/ipmi-sensors/ipmi-sensors-oem-intel-s2600jf.h -@@ -17,7 +17,7 @@ - */ - - #ifndef IPMI_SENSORS_OEM_INTEL_S2600JF_H --#define IPMI_SENSORS_OEM_INTEL_H -+#define IPMI_SENSORS_OEM_INTEL_S2600JF_H - - #include "ipmi-sensors.h" - -diff --git a/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h b/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h -index 0607b125d..5c6410b7b 100644 ---- a/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h -+++ b/ipmi-sensors/ipmi-sensors-oem-intel-s2600wp.h -@@ -17,7 +17,7 @@ - */ - - #ifndef IPMI_SENSORS_OEM_INTEL_S2600WP_H --#define IPMI_SENSORS_OEM_INTEL_H -+#define IPMI_SENSORS_OEM_INTEL_S2600WP_H - - #include "ipmi-sensors.h" - -diff --git a/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h b/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h -index f4f3dc85b..204295bd8 100644 ---- a/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h -+++ b/ipmi-sensors/ipmi-sensors-oem-intel-s5500wb.h -@@ -17,7 +17,7 @@ - */ - - #ifndef IPMI_SENSORS_OEM_INTEL_S5500WB_H --#define IPMI_SENSORS_OEM_INTEL_H -+#define IPMI_SENSORS_OEM_INTEL_S5500WB_H - - #include "ipmi-sensors.h" - --- -2.39.2 - diff --git a/package/freeipmi/0003-ipmi-sensors-add-missing-include.patch b/package/freeipmi/0003-ipmi-sensors-add-missing-include.patch deleted file mode 100644 index 8bc44165a0..0000000000 --- a/package/freeipmi/0003-ipmi-sensors-add-missing-include.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6ac6f816dbfc83d8cd4f4f163b0f8ff1062d883e Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Mon, 25 Mar 2024 13:57:45 -0700 -Subject: [PATCH] ipmi-sensors: add missing include - -Signed-off-by: Albert Chu -[Waldemar: removed Changelog patching] -Signed-off-by: Waldemar Brodkorb -Upstream: https://git.savannah.gnu.org/cgit/freeipmi.git/commit/?h=freeipmi-1-6-0-stable&id=6ac6f816dbfc83d8cd4f4f163b0f8ff1062d883e ---- - ipmi-sensors/ipmi-sensors-oem-intel.c | 1 + - 1 files changed, 1 insertions(+) - -diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c -index 5e0f3733a..3fc022e3d 100644 ---- a/ipmi-sensors/ipmi-sensors-oem-intel.c -+++ b/ipmi-sensors/ipmi-sensors-oem-intel.c -@@ -34,6 +34,7 @@ - #include "ipmi-sensors-oem-intel.h" - #include "ipmi-sensors-oem-intel-s5500wb.h" - #include "ipmi-sensors-oem-intel-s2600jf.h" -+#include "ipmi-sensors-oem-intel-s2600wp.h" - #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h" - #include "ipmi-sensors-oem-intel-node-manager.h" - --- -2.39.2 - diff --git a/package/freeipmi/freeipmi.hash b/package/freeipmi/freeipmi.hash index 2f81d90c1d..9d06be8cf9 100644 --- a/package/freeipmi/freeipmi.hash +++ b/package/freeipmi/freeipmi.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5 freeipmi-1.6.14.tar.gz +sha256 5bcef6bb9eb680e49b4a3623579930ace7899f53925b2045fe9f91ad6904111d freeipmi-1.6.16.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.bmc-watchdog sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.ipmiconsole diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk index fbbfd536e4..0581b931b0 100644 --- a/package/freeipmi/freeipmi.mk +++ b/package/freeipmi/freeipmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREEIPMI_VERSION = 1.6.14 +FREEIPMI_VERSION = 1.6.16 FREEIPMI_SITE = $(BR2_GNU_MIRROR)/freeipmi FREEIPMI_LICENSE = GPL-3.0+, BSD-like (sunbmc) FREEIPMI_LICENSE_FILES = \