diff --git a/.gitignore b/.gitignore index 487aa94..5991ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mstflint-4.11.0-5.tar.gz +SOURCES/mstflint-4.13.3-2.tar.gz diff --git a/.mstflint.metadata b/.mstflint.metadata index adcf2c5..7236b73 100644 --- a/.mstflint.metadata +++ b/.mstflint.metadata @@ -1 +1 @@ -4371a0a9ca8077c71df34761d1fdcf0c4abe127e SOURCES/mstflint-4.11.0-5.tar.gz +d77fe8bf03a63ef51ff362c9f6367c2657e0b2c9 SOURCES/mstflint-4.13.3-2.tar.gz diff --git a/SOURCES/add-default-link-flags-for-shared-libraries.patch b/SOURCES/add-default-link-flags-for-shared-libraries.patch index 4d99c18..1ba9e8a 100644 --- a/SOURCES/add-default-link-flags-for-shared-libraries.patch +++ b/SOURCES/add-default-link-flags-for-shared-libraries.patch @@ -1,8 +1,8 @@ diff --git a/cmdif/Makefile.am b/cmdif/Makefile.am -index d4f89a2..46604f5 100644 +index 0d8f53b..d800302 100644 --- a/cmdif/Makefile.am +++ b/cmdif/Makefile.am -@@ -46,7 +46,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h +@@ -50,7 +50,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h cmdif_pylibdir = $(libdir)/mstflint/python_tools/ cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py ${CCMDIF_SO}: libcmdif.a @@ -12,7 +12,7 @@ index d4f89a2..46604f5 100644 CLEANFILES = ${CCMDIF_SO} diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am -index 907e5ce..a7e2249 100644 +index 3118b85..e708ad8 100644 --- a/dev_mgt/Makefile.am +++ b/dev_mgt/Makefile.am @@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py @@ -37,8 +37,135 @@ index 5f5677d..566a870 100644 CLEANFILES = cmtcr.so +diff --git a/mvpd/Makefile.am b/mvpd/Makefile.am +index e9fa5c6..fab1599 100755 +--- a/mvpd/Makefile.am ++++ b/mvpd/Makefile.am +@@ -1,61 +1,61 @@ +-#-- +-# Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved. +-# +-# This software is available to you under a choice of one of two +-# licenses. You may choose to be licensed under the terms of the GNU +-# General Public License (GPL) Version 2, available from the file +-# COPYING in the main directory of this source tree, or the +-# OpenIB.org BSD license below: +-# +-# Redistribution and use in source and binary forms, with or +-# without modification, are permitted provided that the following +-# conditions are met: +-# +-# - Redistributions of source code must retain the above +-# copyright notice, this list of conditions and the following +-# disclaimer. +-# +-# - Redistributions in binary form must reproduce the above +-# copyright notice, this list of conditions and the following +-# disclaimer in the documentation and/or other materials +-# provided with the distribution. +-# +-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +-# SOFTWARE. +-#-- +- +-# Makefile.am -- Process this file with automake to produce Makefile.in +-MTCR_DIR = $(top_srcdir)/${MTCR_CONF_DIR} +-COMMON_DIR = $(top_srcdir)/common +-LAYOUTS_DIR = $(top_srcdir)/tools_layouts +-USER_DIR = $(top_srcdir) +- +-AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul +-AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC) +- +-noinst_LTLIBRARIES = libmvpd.a +- +-libmvpd_a_SOURCES = mvpd.c mvpd.h +- +-libmvpd_a_DEPENDENCIES = $(MTCR_DIR)/libmtcr_ul.a +-libmvpd_a_LIBADD = $(libmvpd_a_DEPENDENCIES) +- +-RMVPD_SO = rmvpd.so +- +- +-LDADD= ../${MTCR_CONF_DIR}/libmtcr_ul.a ${LDL} +- +- +-noinst_HEADERS = mvpd.h +- +-${RMVPD_SO}: libmvpd.a +- $(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RMVPD_SO} \ +- -L$(MTCR_DIR) -lmtcr_ul +- +-CLEANFILES = ${RMVPD_SO} ++#-- ++# Copyright (c) 2004-2010 Mellanox Technologies LTD. All rights reserved. ++# ++# This software is available to you under a choice of one of two ++# licenses. You may choose to be licensed under the terms of the GNU ++# General Public License (GPL) Version 2, available from the file ++# COPYING in the main directory of this source tree, or the ++# OpenIB.org BSD license below: ++# ++# Redistribution and use in source and binary forms, with or ++# without modification, are permitted provided that the following ++# conditions are met: ++# ++# - Redistributions of source code must retain the above ++# copyright notice, this list of conditions and the following ++# disclaimer. ++# ++# - Redistributions in binary form must reproduce the above ++# copyright notice, this list of conditions and the following ++# disclaimer in the documentation and/or other materials ++# provided with the distribution. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS ++# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ++# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++# SOFTWARE. ++#-- ++ ++# Makefile.am -- Process this file with automake to produce Makefile.in ++MTCR_DIR = $(top_srcdir)/${MTCR_CONF_DIR} ++COMMON_DIR = $(top_srcdir)/common ++LAYOUTS_DIR = $(top_srcdir)/tools_layouts ++USER_DIR = $(top_srcdir) ++ ++AM_CPPFLAGS = -I. -I$(USER_DIR) -I$(srcdir) -I$(LAYOUTS_DIR) -I$(USER_DIR)/include/mtcr_ul ++AM_CFLAGS = -W -Wall -g -MP -MD $(COMPILER_FPIC) ++ ++noinst_LTLIBRARIES = libmvpd.a ++ ++libmvpd_a_SOURCES = mvpd.c mvpd.h ++ ++libmvpd_a_DEPENDENCIES = $(MTCR_DIR)/libmtcr_ul.a ++libmvpd_a_LIBADD = $(libmvpd_a_DEPENDENCIES) ++ ++RMVPD_SO = rmvpd.so ++ ++ ++LDADD= ../${MTCR_CONF_DIR}/libmtcr_ul.a ${LDL} ++ ++ ++noinst_HEADERS = mvpd.h ++ ++${RMVPD_SO}: libmvpd.a ++ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${RMVPD_SO} \ ++ -L$(MTCR_DIR) -lmtcr_ul ++ ++CLEANFILES = ${RMVPD_SO} diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am -index 353fe02..7d70fd8 100644 +index f28290e..a141704 100644 --- a/reg_access/Makefile.am +++ b/reg_access/Makefile.am @@ -53,7 +53,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py diff --git a/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch b/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch index 996c326..3d30269 100644 --- a/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch +++ b/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch @@ -1,8 +1,8 @@ diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp -index 3840579..3d2680b 100644 +index 9dd3afd..076879a 100755 --- a/flint/subcommands.cpp +++ b/flint/subcommands.cpp -@@ -3018,7 +3018,7 @@ FlintStatus SgSubCommand::sgFs2() +@@ -3103,7 +3103,7 @@ FlintStatus SgSubCommand::sgFs2() return FLINT_SUCCESS; } diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec index 3346762..73217a6 100644 --- a/SPECS/mstflint.spec +++ b/SPECS/mstflint.spec @@ -1,23 +1,27 @@ %global __remake_config 1 +%{!?__python3: %global __python3 /usr/bin/python3} +%global __python %{__python3} Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.11.0 -Release: 5%{?dist} +Version: 4.13.3 +Release: 2%{?dist} License: GPLv2+ or BSD Group: Applications/System -Source: https://github.com/Mellanox/mstflint/releases/download/v4.11.0-5/mstflint-4.11.0-5.tar.gz +Source: https://github.com/Mellanox/mstflint/releases/download/v4.13.3-2/mstflint-4.13.3-2.tar.gz Patch3: extend-buffer.patch Patch4: add-default-link-flags-for-shared-libraries.patch Patch5: replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch Url: https://github.com/Mellanox/mstflint BuildRequires: libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc BuildRequires: libcurl-devel, boost-devel, libxml2-devel, openssl-devel +BuildRequires: python3 %if %{__remake_config} BuildRequires: libtool, autoconf, automake %endif Obsoletes: openib-mstflint <= 1.4 openib-tvflash <= 0.9.2 tvflash <= 0.9.0 ExcludeArch: s390 s390x %{arm} +Requires: python3 %description This package contains firmware update tool, vpd dump and register dump tools @@ -55,6 +59,10 @@ find %{buildroot} -type f -name '*.a' -delete %{_mandir}/man1/* %changelog +* Fri Jan 17 2020 Honggang Li - 4.13.3-2 +- Rebase to latest upstream release v4.13.3-2 +- Resolves: bz1788925 + * Thu May 2 2019 Honggang Li - 4.11.0-5 - Rebase to latest upstream release v4.11.0-5 - mstconfig support for prio_tag and ttl_wa