Merge branch 'main' of src.opensuse.org:HPC/mstflint into slfo-main

* 'main' of src.opensuse.org:HPC/mstflint: Update to mstflint-4.33.0-1.60.9ed9e8c3 Add Gitea build results - Add GCC15-C23-support.patch to fix compilation with GCC >= 15 Accepting request 1198979 from home:NMorey:branches:science:HPC
Update to mstflint-4.33.0-1.60.9ed9e8c3
2025-11-27 17:22:31 +01:00 · 2025-11-18 19:27:03 +01:00 · 2025-10-27 17:35:29 +01:00 · 2025-07-11 19:31:07 +00:00 · 2025-07-11 12:53:27 +00:00 · 2024-09-06 15:18:22 +00:00
9 changed files with 89 additions and 71 deletions
--- a/Fix-gcc7-and-gcc8.patch
+++ b/Fix-gcc7-and-gcc8.patch
@@ -1,4 +1,4 @@
-commit 6a8758e9353447abdb9366638790984e84b04eb1
+commit f5644b3f62db9edc49929a5d62fc03bd7fe542ed
 Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
 Date:   Wed Aug 9 17:31:57 2017 +0200

@@ -9,18 +9,18 @@ Date:   Wed Aug 9 17:31:57 2017 +0200
    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>

 diff --git configure.ac configure.ac
-index 4d549ee4cb79..c8e15447f5e1 100644
+index 366d9a115693..dc356443f2cc 100644
 --- configure.ac
 +++ configure.ac
-@@ -308,6 +308,7 @@ AM_CONDITIONAL([USE_LOCAL_SQLITE], [test "$SQLITE_SYSTEM_AVAILABLE" = no])
- 
+@@ -604,6 +604,7 @@ AC_SEARCH_LIBS([sqlite3_initialize], [sqlite3], [SQLITE_SYSTEM_AVAILABLE="yes"],
+ AM_CONDITIONAL([USE_LOCAL_SQLITE], [test "$SQLITE_SYSTEM_AVAILABLE" = no])
 
 CFLAGS="$CFLAGS -DMST_UL"
 +CPPFLAGS="$CPPFLAGS -DMST_UL"
 CXXFLAGS="$CXXFLAGS -DMST_UL"
 
- 
-@@ -336,6 +337,14 @@ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="$CFLAGS -Wno-implici
+ CCVER=`${CC} --version | grep ${CC} | grep -E -o "( )[[4-9]]\.[[0-9]]\.[[0-9]]" | head -1`
+@@ -631,6 +632,14 @@ AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="$CFLAGS -Wno-implici
 AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CFLAGS="$CFLAGS -Wno-cast-function-type"], [], [])
 CFLAGS="$OLD_CFLAGS"
 
--- a/PIE.patch
+++ b/PIE.patch
@@ -1,4 +1,4 @@
-commit da607dd93fc67a63029d08f868e1e1c2c70e9663
+commit 77ebcfe7e1c1d5a3037761aa64de6f9ca32361d7
 Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 Date:   Fri Jul 9 13:01:55 2021 +0200

@@ -9,16 +9,19 @@ Date:   Fri Jul 9 13:01:55 2021 +0200
    Signed-off-by: Hardware error from APEI Generic Hardware Error Source: 0

 diff --git configure.ac configure.ac
-index 35049bcbbed4..273ce3186936 100644
+index dc356443f2cc..ef5fc5584e6a 100644
 --- configure.ac
 +++ configure.ac
-@@ -59,6 +59,9 @@ LDL=""
- default_en_inband=""
+@@ -104,6 +104,12 @@ else
+     fi
+ fi
 
- LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/usr/local/lib64 -L/usr/lib64"
+# All bin programs are linked using LDL
+# reuse this instead of LDFLAGS as it would mess
+# up shared lib builds
 +if test "$host_cpu" != "s390x"; then
-+	LDFLAGS="${LDFLAGS} -pie"
+	LDL="${LDL} -pie"
 +fi
- CXXFLAGS="${CXXFLAGS} -isystem /usr/local/include" 
- if test "x$OS" = "xFreeBSD"; then
-     AC_MSG_NOTICE(FreeBSD Build)
+ 
+ AC_SUBST(MTCR_CONF_DIR)
+ AC_SUBST(VFIO_DRIVER_DIR)
--- a/README.md
+++ b/README.md
@@ -0,0 +1,12 @@
+
+## Build Results
+
+Current state of mstflint in openSUSE:Factory is
+
+![Factory build results](https://br.opensuse.org/status/openSUSE:Factory/mstflint/standard)
+
+The current state of mstflint in the devel project build (science:HPC)
+
+![Devel project build results](https://br.opensuse.org/status/science:HPC/mstflint)
+
+
--- a/Remove-date-time-info-from-build.patch
+++ b/Remove-date-time-info-from-build.patch
@@ -1,24 +0,0 @@
-commit 59982ffad738c25082053bb4a87aa7fb97ebc796
-Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
-Date:   Fri Sep 30 14:10:47 2022 +0200
-
-    Remove date/time info from build
-    
-    Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
-
-diff --git common/tools_version.h common/tools_version.h
-index c656076c13b4..021da5429402 100644
--- common/tools_version.h
-+++ common/tools_version.h
-@@ -74,8 +74,9 @@ static inline int get_version_string(char* buf, int buf_size, const char* exe_na
-         len = snprintf(buf, buf_size, "%s %s, ", exe_name, tool_version);
-     }
-     // cut out first and last "$" from the SVN version string:
-    len += snprintf(buf + len, buf_size - len, "%s, built on %s, %s. Git SHA Hash: %s", MSTFLINT_VERSION_STR, __DATE__,
-                    __TIME__, TOOLS_GIT_SHA);
-+    len += snprintf(buf + len, buf_size - len, "%s. Git SHA Hash: %s",
-+                    MSTFLINT_VERSION_STR,
-+                    TOOLS_GIT_SHA);
-     return len;
- }
- 
--- a/17
+++ b/17
@@ -0,0 +1,17 @@
+<services>
+  <service name="tar_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/Mellanox/mstflint.git</param>
+    <param name="package-meta">no</param>
+    <param name="exclude">.git</param>
+    <param name="filename">mstflint</param>
+    <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="revision">9ed9e8c36608035769534e7450d1885483df8eaf</param>
+  </service>
+  <service name="recompress" mode="manual">
+    <param name="file">*mstflint*.tar</param>
+    <param name="compression">gz</param>
+  </service>
+</services>
--- a/fix-race-condition-during-install.patch
+++ b/fix-race-condition-during-install.patch
@@ -1,21 +0,0 @@
-commit 77d8c2e2d7de83dc8202d99bb995c423299229fb
-Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
-Date:   Mon Oct 15 09:33:09 2018 +0200
-
-    fix race condition during install
-    
-    Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
-
-diff --git dev_mgt/Makefile.am dev_mgt/Makefile.am
-index 3118b85f97a4..193abaf79e11 100644
--- dev_mgt/Makefile.am
-+++ dev_mgt/Makefile.am
-@@ -46,7 +46,7 @@ libdev_mgt_a_SOURCES = \
- 
- dev_mgt_pylibdir = $(libdir)/mstflint/python_tools/
- 
-dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
-+dev_mgt_pylib_DATA = c_dev_mgt.so
- dist_dev_mgt_pylib_DATA = dev_mgt.py
- 
- c_dev_mgt.so: libdev_mgt.a
--- a/mstflint-4.33.0-1.60.9ed9e8c3.tar.gz
+++ b/mstflint-4.33.0-1.60.9ed9e8c3.tar.gz
--- a/mstflint.changes
+++ b/mstflint.changes
@@ -1,5 +1,31 @@
 -------------------------------------------------------------------
-Thu Mar 27 09:59:21 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.com>
+Tue Nov 18 16:42:34 UTC 2025 - Nicolas Morey <nicolas.morey@suse.com>
+
+- Add _service to fetch from git directly
+- Update to mstflint-4.33.0-1.60.9ed9e8c3
+  - See https://github.com/Mellanox/mstflint/releases/tag/v4.33.0-1
+- Drop patches merged upstream:
+  - Remove-date-time-info-from-build.patch
+  - fix-race-condition-during-install.patch
+  - GCC15-C23-support.patch
+  - mflash-add-missing-stlib-include.patch
+- Refresh patches against new sources:
+  - Fix-gcc7-and-gcc8.patch
+  - PIE.patch
+
+-------------------------------------------------------------------
+Fri Jul 11 06:41:42 UTC 2025 - Nicolas Morey <nicolas.morey@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 %autosetup to work with rpm-4.20 (bsc#1240154)

--- a/mstflint.spec
+++ b/mstflint.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mstflint
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,21 +16,20 @@
 #


-%define extra_version -1
+%define git_ver -1.60.9ed9e8c3

 Name:           mstflint
-Version:        4.21.0
+Version:        4.33.0
 Release:        0
 Summary:        Mellanox Firmware Burning and Diagnostics Tools
 License:        BSD-2-Clause OR GPL-2.0-only
 Group:          System/Console
 URL:            http://www.openfabrics.org
 Obsoletes:      mstflint-devel < %{version}
-Source:         https://github.com/Mellanox/mstflint/releases/download/v%{version}%{extra_version}/mstflint-%{version}%{extra_version}.tar.gz
-Patch1:         Remove-date-time-info-from-build.patch
-Patch4:         Fix-gcc7-and-gcc8.patch
-Patch5:         fix-race-condition-during-install.patch
-Patch6:         PIE.patch
+Source:         mstflint-%{version}%{?git_ver}.tar.gz
+Source100:      README.md
+Patch1:         Fix-gcc7-and-gcc8.patch
+Patch2:         PIE.patch
 BuildRequires:  gcc-c++
 BuildRequires:  infiniband-diags-devel
 BuildRequires:  libibverbs-devel
@@ -49,7 +48,7 @@ package. For a full documentation of the MFT package, please refer to
 the downloads page at the Mellanox web site.

 %prep
-%autosetup -p0
+%autosetup -p0 -n %{name}-%{version}%{git_ver}

 %build
 ./autogen.sh
@@ -69,16 +68,19 @@ rm -rf %{buildroot}%{_bindir}/hca_self_test.ofed
 %license LICENSE COPYING
 %{_bindir}/mstconfig
 %{_bindir}/mstcongestion
+%{_bindir}/mstdevices_info
 %{_bindir}/mstflint
+%{_bindir}/mstfwctrl
 %{_bindir}/mstfwreset
 %{_bindir}/mstmcra
+%{_bindir}/mstmget_temp
 %{_bindir}/mstmread
 %{_bindir}/mstmtserver
 %{_bindir}/mstmwrite
-%{_bindir}/mstprivhost
 %{_bindir}/mstregdump
 %{_bindir}/mstresourcedump
 %{_bindir}/mstresourceparse
+%{_bindir}/msttokengenerator
 %{_bindir}/mstvpd
 %{_bindir}/mstfwtrace
 %{_mandir}/man1/*.1%{ext_man}
Author	SHA256	Message	Date
Nicolas Morey	35c1edf6b8	Merge branch 'main' of src.opensuse.org:HPC/mstflint into slfo-main * 'main' of src.opensuse.org:HPC/mstflint: Update to mstflint-4.33.0-1.60.9ed9e8c3 Add Gitea build results - Add GCC15-C23-support.patch to fix compilation with GCC >= 15 Accepting request 1198979 from home:NMorey:branches:science:HPC	2025-11-27 17:22:31 +01:00
Nicolas Morey	d4cbecb7ad	Update to mstflint-4.33.0-1.60.9ed9e8c3 - See https://github.com/Mellanox/mstflint/releases/tag/v4.33.0-1 Signed-off-by: Nicolas Morey <nmorey@suse.com>	2025-11-18 19:27:03 +01:00
Adam Majer	8540aa04bc	Add Gitea build results	2025-10-27 17:35:29 +01:00
Ana Guerrero	48c58255a6	Accepting request 1292064 from science:HPC OBS-URL: https://build.opensuse.org/request/show/1292064 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=30	2025-07-11 19:31:07 +00:00
Nicolas Morey	f8ea6b137a	- Add GCC15-C23-support.patch to fix compilation with GCC >= 15 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=59	2025-07-11 12:53:27 +00:00
Ana Guerrero	e3a1993f9c	Accepting request 1198994 from science:HPC OBS-URL: https://build.opensuse.org/request/show/1198994 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=29	2024-09-06 15:18:22 +00:00
Nicolas Morey	a5135e5a1e	Accepting request 1198979 from home:NMorey:branches:science:HPC - Add mflash-add-missing-stlib-include.patch to fix compilation with GCC >= 14 OBS-URL: https://build.opensuse.org/request/show/1198979 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=57	2024-09-05 13:06:26 +00:00