From 9db0ec960ac67c7806be44a2fc2b2b67d4657058 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 10:58:26 +0000 Subject: import mstflint-4.11.0-5.el7 --- diff --git a/.gitignore b/.gitignore index b460b60..487aa94 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mstflint-4.9.0-3.tar.gz +SOURCES/mstflint-4.11.0-5.tar.gz diff --git a/.mstflint.metadata b/.mstflint.metadata index adbe9e8..adcf2c5 100644 --- a/.mstflint.metadata +++ b/.mstflint.metadata @@ -1 +1 @@ -acbb381ef32aa2b27b937b76d72e0c22cb656097 SOURCES/mstflint-4.9.0-3.tar.gz +4371a0a9ca8077c71df34761d1fdcf0c4abe127e SOURCES/mstflint-4.11.0-5.tar.gz diff --git a/SOURCES/add-default-link-flags-for-shared-libraries.patch b/SOURCES/add-default-link-flags-for-shared-libraries.patch new file mode 100644 index 0000000..4d99c18 --- /dev/null +++ b/SOURCES/add-default-link-flags-for-shared-libraries.patch @@ -0,0 +1,52 @@ +diff --git a/cmdif/Makefile.am b/cmdif/Makefile.am +index d4f89a2..46604f5 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 + cmdif_pylibdir = $(libdir)/mstflint/python_tools/ + cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py + ${CCMDIF_SO}: libcmdif.a +- $(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${CCMDIF_SO} \ ++ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${CCMDIF_SO} \ + -L$(USER_DIR)/tools_layouts -ltools_layouts -L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul + + CLEANFILES = ${CCMDIF_SO} +diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am +index 907e5ce..a7e2249 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 + dist_dev_mgt_pylib_DATA = dev_mgt.py + + c_dev_mgt.so: libdev_mgt.a +- $(CC) -g -Wall -pthread -shared ${CFLAGS} tools_dev_types.o -o c_dev_mgt.so \ ++ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} tools_dev_types.o -o c_dev_mgt.so \ + -L$(USER_DIR)/reg_access -lreg_access \ + -L$(USER_DIR)/tools_layouts -ltools_layouts \ + -L$(USER_DIR)/${MTCR_CONF_DIR} -lmtcr_ul +diff --git a/mtcr_py/Makefile.am b/mtcr_py/Makefile.am +index 5f5677d..566a870 100644 +--- a/mtcr_py/Makefile.am ++++ b/mtcr_py/Makefile.am +@@ -39,7 +39,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR} + mtcr_pylib_DATA = cmtcr.so mtcr.py + dist_mtcr_pylib_DATA = mtcr.py + cmtcr.so: +- $(CC) -g -Wall -pthread -shared ${CFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so ++ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so + + CLEANFILES = cmtcr.so + +diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am +index 353fe02..7d70fd8 100644 +--- a/reg_access/Makefile.am ++++ b/reg_access/Makefile.am +@@ -53,7 +53,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} regaccess.py + dist_reg_access_pylib_DATA = regaccess.py + + ${RREG_ACCESS_SO}: libreg_access.a +- $(CC) -g -Wall -pthread -shared ${CFLAGS} *.o -o ${RREG_ACCESS_SO} \ ++ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} *.o -o ${RREG_ACCESS_SO} \ + -L$(USER_DIR)/tools_layouts -ltools_layouts -L$(MTCR_DIR) -lmtcr_ul + + CLEANFILES = ${RREG_ACCESS_SO} diff --git a/SOURCES/extend-buffer.patch b/SOURCES/extend-buffer.patch new file mode 100644 index 0000000..99136a3 --- /dev/null +++ b/SOURCES/extend-buffer.patch @@ -0,0 +1,13 @@ +diff --git a/ext_libs/iniParser/iniparser.c b/ext_libs/iniParser/iniparser.c +index 8bc0a18..f981775 100644 +--- a/ext_libs/iniParser/iniparser.c ++++ b/ext_libs/iniParser/iniparser.c +@@ -572,7 +572,7 @@ dictionary * iniparser_load(const char * ininame) + char line [ASCIILINESZ+1] ; + char section [ASCIILINESZ+1] ; + char key [ASCIILINESZ+1] ; +- char tmp [ASCIILINESZ+1] ; ++ char tmp [(ASCIILINESZ+1)*2] ; + char val [ASCIILINESZ+1] ; + + int last=0 ; diff --git a/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch b/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch new file mode 100644 index 0000000..996c326 --- /dev/null +++ b/SOURCES/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch @@ -0,0 +1,13 @@ +diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp +index 3840579..3d2680b 100644 +--- a/flint/subcommands.cpp ++++ b/flint/subcommands.cpp +@@ -3018,7 +3018,7 @@ FlintStatus SgSubCommand::sgFs2() + return FLINT_SUCCESS; + } + +-#define FW_RESET_MSG "To load new configuration run mlxfwreset or reboot machine" ++#define FW_RESET_MSG "To load new configuration run mstfwreset or reboot machine" + + FlintStatus SgSubCommand::sgFs3() + { diff --git a/SPECS/mstflint.spec b/SPECS/mstflint.spec index 2f068fe..3346762 100644 --- a/SPECS/mstflint.spec +++ b/SPECS/mstflint.spec @@ -1,17 +1,23 @@ +%global __remake_config 1 + Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.9.0 -Release: 3%{?dist} +Version: 4.11.0 +Release: 5%{?dist} License: GPLv2+ or BSD Group: Applications/System -# Source downloaded from https://github.com/Mellanox/%{name}/releases/download/v%{version}-3/%{name}-%{version}.tar.gz -# Rename it as mstflint-4.9.0-3.tar.gz -Source: mstflint-4.9.0-3.tar.gz +Source: https://github.com/Mellanox/mstflint/releases/download/v4.11.0-5/mstflint-4.11.0-5.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, rdma-core-devel +BuildRequires: libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc BuildRequires: libcurl-devel, boost-devel, libxml2-devel, openssl-devel +%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 +ExcludeArch: s390 s390x %{arm} %description This package contains firmware update tool, vpd dump and register dump tools @@ -19,12 +25,16 @@ for network adapters based on Mellanox Technologies chips. %prep %setup -q +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' 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" +%if %{__remake_config} +./autogen.sh +%endif %configure --enable-fw-mgr %make_build @@ -33,7 +43,7 @@ make DESTDIR=%{buildroot} install # Remove the devel files that we don't ship rm -fr %{buildroot}%{_includedir} find %{buildroot} -type f -name '*.la' -delete -find %{buildroot} -type f -name libmtcr_ul.a -delete +find %{buildroot} -type f -name '*.a' -delete %files %doc README @@ -45,6 +55,19 @@ find %{buildroot} -type f -name libmtcr_ul.a -delete %{_mandir}/man1/* %changelog +* 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 +- Resolves: bz1694703 + +* Wed Feb 20 2019 Honggang Li - 4.11.0-3 +- Rebase to latest upstream release v4.11.0-3 +- Resolves: bz1641924 + +* Fri Feb 1 2019 Honggang Li - 4.11.0-2 +- Rebase to latest upstream release v4.11.0-2 +- Resolves: bz1641924 + * Sun May 6 2018 Honggang Li - 4.9.0-3 - Rebase to latest upstream release v4.9.0-3 - Resolves: bz1541740