diff --git a/.gitignore b/.gitignore index f9a512a..2045b45 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mstflint-4.6.0.tar.gz +SOURCES/mstflint-4.8.0.tar.gz diff --git a/.mstflint.metadata b/.mstflint.metadata index 5653efa..05933a1 100644 --- a/.mstflint.metadata +++ b/.mstflint.metadata @@ -1 +1 @@ -41c794f397f031be0f000b0422cd45d3fd44e374 SOURCES/mstflint-4.6.0.tar.gz +be896725828c4274c423ae198efa9f47c7803d7e SOURCES/mstflint-4.8.0.tar.gz diff --git a/SOURCES/0001-Return-zero-when-fread-reach-the-end-of-vpd-file.patch b/SOURCES/0001-Return-zero-when-fread-reach-the-end-of-vpd-file.patch new file mode 100644 index 0000000..e69a33d --- /dev/null +++ b/SOURCES/0001-Return-zero-when-fread-reach-the-end-of-vpd-file.patch @@ -0,0 +1,33 @@ +From 1a097ee9a70a92dd8e81618e42ee3795e2dad004 Mon Sep 17 00:00:00 2001 +From: Honggang Li +Date: Wed, 6 Dec 2017 23:59:43 -0500 +Subject: [PATCH] Return zero when fread reach the end of vpd file + +Fixes: 4201e56ec8e8 (Title: use mvpd in mstvpd) +Signed-off-by: Honggang Li +--- + mtcr_ul/mtcr_ul_com.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c +index ddafd0a..9f328b5 100644 +--- a/mtcr_ul/mtcr_ul_com.c ++++ b/mtcr_ul/mtcr_ul_com.c +@@ -2575,9 +2575,11 @@ int mvpd_read4_ul_int(mfile *mf, unsigned int offset, u_int8_t value[4]){ + return errno; + } + if (fread(value, 1, 4, f) < 1) { +- //fprintf(stderr, "Failed to read from (%s): %s\n", proc_dev, strerror(errno)); +- fclose(f); +- return errno; ++ if (!feof(f)) { ++ //fprintf(stderr, "Failed to read from (%s): %s\n", proc_dev, strerror(errno)); ++ fclose(f); ++ return errno; ++ } + } + fclose(f); + return 0; +-- +1.8.3.1 + diff --git a/SOURCES/fix-issues-reported-by-lexgrog.patch b/SOURCES/fix-issues-reported-by-lexgrog.patch deleted file mode 100644 index 6a34df0..0000000 --- a/SOURCES/fix-issues-reported-by-lexgrog.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/man/mstconfig.1 b/man/mstconfig.1 -index d172e66..5318716 100644 ---- a/man/mstconfig.1 -+++ b/man/mstconfig.1 -@@ -1,6 +1,6 @@ - .TH MSTCONFIG "1" "4.6.0" "10 January 2017" "" - .SH NAME --mstconfig -+mstconfig \- Sets or queries non-volatile configurable options for Mellanox HCAs - .IP - .SH SYNOPSIS: - .IP -diff --git a/man/mstmcra.1 b/man/mstmcra.1 -index 935f39e..a7be945 100644 ---- a/man/mstmcra.1 -+++ b/man/mstmcra.1 -@@ -1,6 +1,6 @@ - .TH MSTMCRA "1" "4.6.0" "" - .SH NAME --mstmcra -+mstmcra \- Mellanox Configuration Registers Access tool - .IP - .SH SYNOPSIS: - .IP -diff --git a/man/mstmread.1 b/man/mstmread.1 -index d47feb2..985a159 100644 ---- a/man/mstmread.1 -+++ b/man/mstmread.1 -@@ -1,6 +1,6 @@ - .TH MSTMREAD "1" "4.6.0" "" - .SH NAME --mstmread -+mstmread \- Mellanox Read Configuration Register Tool - .IP - .SH SYNOPSIS: - .IP -diff --git a/man/mstmtserver.1 b/man/mstmtserver.1 -index 22ba224..1762241 100644 ---- a/man/mstmtserver.1 -+++ b/man/mstmtserver.1 -@@ -1,6 +1,6 @@ - .TH MSTMTSERVER "1" "4.6.0" "" - .SH NAME --mstmtserver -+mstmtserver \- Mellanox Software tools (mst) server (remote mtcr calls) - .IP - .SH SYNOPSIS: - .IP -diff --git a/man/mstmwrite.1 b/man/mstmwrite.1 -index b3cc05a..b8dcbe9 100644 ---- a/man/mstmwrite.1 -+++ b/man/mstmwrite.1 -@@ -1,6 +1,6 @@ - .TH MSTMWRITE "1" "4.6.0" "" "" - .SH NAME --mstmwrite -+mstmwrite \- Mellanox Write Configuration Register Tool - .IP - .SH SYNOPSIS: - .IP -diff --git a/man/mstregdump.1 b/man/mstregdump.1 -index 77a6e3c..f7db942 100644 ---- a/man/mstregdump.1 -+++ b/man/mstregdump.1 -@@ -1,6 +1,6 @@ - .TH MSTREGDUMP "1" "4.6.0" "" "" - .SH NAME --mstregdump -+mstregdump \- Dumps Mellanox device internal configuration data - .IP - .SH SYNOPSIS: - .IP -diff --git a/man/mstvpd.1 b/man/mstvpd.1 -index 85ca8f4..9fb02e2 100644 ---- a/man/mstvpd.1 -+++ b/man/mstvpd.1 -@@ -1,6 +1,6 @@ - .TH MSTVPD "1" "4.6.0" "" "" - .SH NAME --mstvpd -+mstvpd \- Mellanox VPD read tool - .IP - .SH SYNOPSIS: - .IP diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec index 919f247..26888f2 100644 --- a/SPECS/mstflint.spec +++ b/SPECS/mstflint.spec @@ -1,20 +1,21 @@ Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.6.0 -Release: 2%{?dist} +Version: 4.8.0 +Release: 3%{?dist} License: GPLv2+ or BSD Group: Applications/System -Source: https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}.tar.gz +Source: https://github.com/Mellanox/%{name}/files/1457191/%{name}-%{version}.tar.gz Patch1: 0001-Extend-buffer-for-a-few-arrays.patch -Patch2: fix-issues-reported-by-lexgrog.patch +Patch2: 0001-Return-zero-when-fread-reach-the-end-of-vpd-file.patch Url: https://github.com/Mellanox/mstflint BuildRequires: libstdc++-devel, zlib-devel, libibmad-devel +BuildRequires: libcurl-devel, boost-devel, libxml2-devel, openssl-devel Obsoletes: openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0 ExcludeArch: s390 s390x %description -This package contains a burning tool for Mellanox manufactured HCA cards. -It also provides access to the relevant source code. +This package contains firmware update tool, vpd dump and register dump tools +for network adapters based on Mellanox Technologies chips. %prep %setup -q @@ -26,23 +27,42 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' %build export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -Wno-c++11-compat" -%configure +%configure --enable-fw-mgr %make_build %install make DESTDIR=%{buildroot} install # Remove the devel files that we don't ship rm -fr %{buildroot}%{_includedir} -rm -fr %{buildroot}%{_libdir} +find %{buildroot} -type f -name '*.la' -delete +find %{buildroot} -type f -name libmtcr_ul.a -delete %files %doc README %_bindir/* +%{_sysconfdir}/mstflint +%{_libdir}/mstflint %{_datadir}/mstflint %{_mandir}/man1/* %changelog +* Thu Dec 7 2017 Honggang Li - 4.8.0-3 +- Fixes mstvpd for mlx5 devices +- Resolves: bz1515993 + +* Sun Nov 12 2017 Honggang Li - 4.8.0-2 +- Remove redundant file from mstflint +- Resolves: bz1512368 + +* Wed Nov 1 2017 Honggang Li - 4.8.0-1 +- Rebase to upstream latest release 4.8.0 +- Resolves: bz1456545 + +* Fri Oct 6 2017 Honggang Li - 4.7.0-1 +- Rebase to upstream latest release 4.7.0 +- Resolves: bz1456545 + * Tue Mar 7 2017 Honggang Li - 4.6.0-2 - Fix manpage issues reported by lexgrog. - Resolves: bz948474