1 Commits

Author SHA256 Message Date
16843666af Sync changes to SLFO-1.2 branch 2025-08-20 09:53:28 +02:00
8 changed files with 14 additions and 161 deletions

View File

@@ -1,40 +0,0 @@
commit 472b859ebe5486f62f670e76cbc3fcf5d994c2c0
Author: Nicolas Morey <nmorey@suse.com>
Date: Fri Jul 11 08:35:50 2025 +0200
GCC15/C23 support
Signed-off-by: Nicolas Morey <nmorey@suse.com>
diff --git common/bit_slice.h common/bit_slice.h
index 9f1764339604..20885cf99cd7 100644
--- common/bit_slice.h
+++ common/bit_slice.h
@@ -59,6 +59,7 @@
#define EXT64(src, end, start) EXTRACT64(src, start, end - start + 1)
#ifndef __cplusplus
+#if __STDC_VERSION__ < 202300L
enum cpp_bool
{
false = 0,
@@ -66,5 +67,6 @@ enum cpp_bool
};
typedef unsigned char bool;
#endif
+#endif
#endif
diff --git small_utils/mtserver.c small_utils/mtserver.c
index d75ec2e25aef..8e8e6417c513 100644
--- small_utils/mtserver.c
+++ small_utils/mtserver.c
@@ -607,7 +607,7 @@ void usage(const char* s)
}
/* ////////////////////////////////////////////////////////////////////// */
-void mySignal()
+void mySignal(int arg)
{
exit(0);
}

View File

@@ -8,12 +8,12 @@ Date: Fri Jul 9 13:01:55 2021 +0200
Signed-off-by: Hardware error from APEI Generic Hardware Error Source: 0
Index: configure.ac
===================================================================
--- configure.ac.orig
diff --git configure.ac configure.ac
index 35049bcbbed4..273ce3186936 100644
--- configure.ac
+++ configure.ac
@@ -91,6 +91,9 @@ AM_CONDITIONAL(KERNEL_BUILD,[test ${KERN
AC_SUBST(KERNEL_BUILD)
@@ -59,6 +59,9 @@ LDL=""
default_en_inband=""
LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib64 -L/usr/lib64"
+if test "$host_cpu" != "s390x"; then

View File

@@ -1,4 +1,4 @@
commit f86bbb8e3d722796ac464910e8e6b79ebb638d39
commit 77d8c2e2d7de83dc8202d99bb995c423299229fb
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Mon Oct 15 09:33:09 2018 +0200
@@ -7,7 +7,7 @@ Date: Mon Oct 15 09:33:09 2018 +0200
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
diff --git dev_mgt/Makefile.am dev_mgt/Makefile.am
index 2283c2d1c763..2e4d7781e245 100644
index 3118b85f97a4..193abaf79e11 100644
--- dev_mgt/Makefile.am
+++ dev_mgt/Makefile.am
@@ -46,7 +46,7 @@ libdev_mgt_a_SOURCES = \
@@ -19,29 +19,3 @@ index 2283c2d1c763..2e4d7781e245 100644
dist_dev_mgt_pylib_DATA = dev_mgt.py
c_dev_mgt.so: libdev_mgt.a
diff --git mtcr_py/Makefile.am mtcr_py/Makefile.am
index 934b8030a229..da7d2aed878f 100644
--- mtcr_py/Makefile.am
+++ mtcr_py/Makefile.am
@@ -37,7 +37,7 @@ mtcr_pylibdir = $(libdir)/mstflint/python_tools/
USER_DIR = ..
MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR}
-mtcr_pylib_DATA = cmtcr.so mtcr.py
+mtcr_pylib_DATA = cmtcr.so
dist_mtcr_pylib_DATA = mtcr.py
cmtcr.so:
$(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK)
diff --git reg_access/Makefile.am reg_access/Makefile.am
index c33bac653620..8783d2953a78 100644
--- reg_access/Makefile.am
+++ reg_access/Makefile.am
@@ -52,7 +52,7 @@ libmlxconfig_4th_gen_regsiters_a_LIBADD = $(libmlxconfig_4th_gen_regsiters_la_DE
RREG_ACCESS_SO = rreg_access.so
reg_access_pylibdir = $(libdir)/mstflint/python_tools/
-reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py regaccess_structs.py
+reg_access_pylib_DATA = ${RREG_ACCESS_SO}
dist_reg_access_pylib_DATA = regaccess.py regaccess_structs.py
${RREG_ACCESS_SO}: libreg_access.a

View File

@@ -1,40 +0,0 @@
commit df180102768284a7223ada6d7243531f9e9be2c7
Author: Nicolas Morey <nmorey@suse.com>
Date: Thu Sep 5 14:08:06 2024 +0200
mflash: add missing stlib include
Add missing include to fix GCC 14 build error:
In file included from mflash_dev_capability.c:42:
mflash_dev_capability.c: In function 'get_flash_gen':
mflash_dev_capability.h:67:27: error: implicit declaration of function 'getenv' [-Wimplicit-function-declaration]
67 | char* reacDebug = getenv("FLASH_DEBUG"); \
| ^~~~~~
mflash_dev_capability.c:186:5: note: in expansion of macro 'DPRINTF'
186 | DPRINTF(("get_flash_gen: flash_gen = %d\n", gen));
| ^~~~~~~
mflash_dev_capability.c:43:1: note: 'getenv' is defined in header '<stdlib.h>'; this is probably fixable by adding '#include <stdlib.h>'
42 | #include "mflash_dev_capability.h"
+++ |+#include <stdlib.h>
43 |
mflash_dev_capability.h:67:27: error: initialization of 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
67 | char* reacDebug = getenv("FLASH_DEBUG"); \
| ^~~~~~
mflash_dev_capability.c:186:5: note: in expansion of macro 'DPRINTF'
186 | DPRINTF(("get_flash_gen: flash_gen = %d\n", gen));
| ^~~~~~~
Signed-off-by: Nicolas Morey <nmorey@suse.com>
diff --git mflash/mflash_dev_capability.h mflash/mflash_dev_capability.h
index d63b7cffaf90..ce850a982d84 100644
--- mflash/mflash_dev_capability.h
+++ mflash/mflash_dev_capability.h
@@ -42,6 +42,7 @@
#ifndef USER_MFLASH_MFLASH_DEV_CAPABILITY_H_
#define USER_MFLASH_MFLASH_DEV_CAPABILITY_H_
+#include <stdlib.h>
#include "mflash_pack_layer.h"
#ifndef UEFI_BUILD

BIN
mstflint-4.21.0-1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9d81a259fafc6b7ab7f9b1946f5a2f2eb012f3f2e71097fee229c8125956f79b
size 7473881

View File

@@ -1,46 +1,7 @@
-------------------------------------------------------------------
Fri Jul 11 06:41:42 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
Thu Mar 27 09:59:21 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
- Add GCC15-C23-support.patch to fix compilation with GCC >= 15
-------------------------------------------------------------------
Thu Sep 5 12:11:14 UTC 2024 - Nicolas Morey <nicolas.morey@suse.com>
- Add mflash-add-missing-stlib-include.patch to fix compilation
with GCC >= 14
-------------------------------------------------------------------
Thu Feb 22 13:26:27 UTC 2024 - pgajdos@suse.com
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Thu Sep 28 13:48:49 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
- Update to 4.25.0
https://github.com/Mellanox/mstflint/files/12317054/MSTFLINT.Package.-Firmware.Burning.and.Diagnostics.Tools.Documentation.v4.25.0.pdf
- Refresh fix-race-condition-during-install.patch to handle new race conditions
-------------------------------------------------------------------
Mon Jul 17 10:01:00 UTC 2023 - Nicolas Morey <nicolas.morey@suse.com>
- Update to 4.24.0
https://github.com/Mellanox/mstflint/releases/download/v4.24.0-1/MSTFLINT.Package.-Firmware.Burning.and.Diagnostics.Tools.Documentation.v4.24.0.pdf
- Refresh fix-race-condition-during-install.patch to handle new race conditions
-------------------------------------------------------------------
Wed Jun 7 11:59:17 UTC 2023 - pgajdos@suse.com
- version update to 4.23.0
https://github.com/Mellanox/mstflint/releases/download/v4.23.0-1/MSTFLINT.Package.-Firmware.Burning.and.Diagnostics.Tools.Documentation.v4.23.0.pdf
- modified patches
% PIE.patch (refreshed)
-------------------------------------------------------------------
Mon Oct 17 13:58:26 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- Updated fix-race-condition-during-install.patch to fix another
race condition during install
- Use %autosetup to work with rpm-4.20 (bsc#1240154)
-------------------------------------------------------------------
Fri Sep 30 12:11:40 UTC 2022 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package mstflint
#
# Copyright (c) 2025 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define extra_version -1
Name: mstflint
Version: 4.25.0
Version: 4.21.0
Release: 0
Summary: Mellanox Firmware Burning and Diagnostics Tools
License: BSD-2-Clause OR GPL-2.0-only
@@ -31,8 +31,6 @@ Patch1: Remove-date-time-info-from-build.patch
Patch4: Fix-gcc7-and-gcc8.patch
Patch5: fix-race-condition-during-install.patch
Patch6: PIE.patch
Patch7: mflash-add-missing-stlib-include.patch
Patch8: GCC15-C23-support.patch
BuildRequires: gcc-c++
BuildRequires: infiniband-diags-devel
BuildRequires: libibverbs-devel