diff mbox series

[meta-oe,05/29] freeipmi: upgrade 1.6.15 -> 1.6.16

Message ID 20250924090029.1786-5-wangmy@fujitsu.com
State New
Headers show
Series [meta-oe,01/29] btop: upgrade 1.4.4 -> 1.4.5 | expand

Commit Message

Wang Mingyu Sept. 24, 2025, 9 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-for-GCC15-C23-build-failure.patch
removed since it's included in 1.6.16

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...0001-Fix-for-GCC15-C23-build-failure.patch | 42 -------------------
 ...{freeipmi_1.6.15.bb => freeipmi_1.6.16.bb} |  7 +---
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
 rename meta-oe/recipes-support/freeipmi/{freeipmi_1.6.15.bb => freeipmi_1.6.16.bb} (85%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
deleted file mode 100644
index ee27fe7906..0000000000
--- a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
+++ /dev/null
@@ -1,42 +0,0 @@ 
-From 5afe6492735938e0053ae78817399fa433f0f8c7 Mon Sep 17 00:00:00 2001
-From: "Pavel Cahyna" <pcahyna@redhat.com>
-Date: Tue, 8 Apr 2025 19:05:53 +0900
-Subject: [PATCH] Fix for GCC15 / C23 build failure
-
-* Import submitted patch from:
-  https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html
-
-  to fix:
-  http://errors.yoctoproject.org/Errors/Details/851185/
-  Error occurs with gcc version 15.
-  In gcc-15, C23 is the default and 'bool' is used as a reserved keyword.
-  https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html]
-Signed-off-by: mark.yang <mark.yang@lge.com>
----
- common/toolcommon/tool-config-file-common.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/common/toolcommon/tool-config-file-common.c b/common/toolcommon/tool-config-file-common.c
-index 609e7a3..20dfad5 100644
---- a/common/toolcommon/tool-config-file-common.c
-+++ b/common/toolcommon/tool-config-file-common.c
-@@ -78,14 +78,14 @@ _config_file_bool (conffile_t cf,
-                    void *app_ptr,
-                    int app_data)
- {
--  int *bool;
-+  int *value;
- 
-   assert (data);
-   assert (optionname);
-   assert (option_ptr);
- 
--  bool = (int *)option_ptr;
--  *bool = data->boolval;
-+  value = (int *)option_ptr;
-+  *value = data->boolval;
-   return (0);
- }
- 
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.16.bb
similarity index 85%
rename from meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
rename to meta-oe/recipes-support/freeipmi/freeipmi_1.6.16.bb
index e04ebfb0c6..f5be870b1d 100644
--- a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
+++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.16.bb
@@ -13,11 +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-for-GCC15-C23-build-failure.patch \
-"
-SRC_URI[sha256sum] = "d6929c354639f5ce75b5b1897e8b366eb63625c23e5c4590a7aea034fe2b8caf"
+SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz"
+SRC_URI[sha256sum] = "5bcef6bb9eb680e49b4a3623579930ace7899f53925b2045fe9f91ad6904111d"
 
 DEPENDS = "libgcrypt"
 DEPENDS:append:libc-musl = " argp-standalone"