diff --git a/.gitignore b/.gitignore index 53d235d..8255243 100644 --- a/.gitignore +++ b/.gitignore @@ -34,8 +34,15 @@ noarch/ /mstflint-4.14.0-3.tar.gz /mstflint-4.15.0-1.tar.gz /mstflint-4.16.0-1.tar.gz +/mstflint-4.16.0-2.tar.gz /mstflint-4.17.0-1.tar.gz /mstflint-4.18.0-1.tar.gz +/mstflint-2b022989e5f22875284f3fbaccf67361ef5a848d.tar.gz +/mstflint-4.20.0-1.tar.gz +/mstflint-4.20.1-1.tar.gz /mstflint-4.21.0-1.tar.gz /mstflint-4.23.0-1.tar.gz /mstflint-4.24.0-1.tar.gz +/mstflint-4.25.0-1.tar.gz +/mstflint-4.26.0-1.tar.gz +/mstflint-4.29.0-1.tar.gz diff --git a/0001-Fix-bind-now-test.patch b/0001-Fix-bind-now-test.patch new file mode 100644 index 0000000..a489d5f --- /dev/null +++ b/0001-Fix-bind-now-test.patch @@ -0,0 +1,26 @@ +From f9c2ffd7935fb799a084d74ee432e21c3f45b6f1 Mon Sep 17 00:00:00 2001 +From: Kamal Heib +Date: Fri, 24 May 2024 21:15:47 -0400 +Subject: [PATCH] Fix bind-now test + +Signed-off-by: Kamal Heib +--- + resourcetools/resourcedump_lib/src/sdk/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/resourcetools/resourcedump_lib/src/sdk/Makefile.am b/resourcetools/resourcedump_lib/src/sdk/Makefile.am +index aefc88a4f849..de9577b27379 100644 +--- a/resourcetools/resourcedump_lib/src/sdk/Makefile.am ++++ b/resourcetools/resourcedump_lib/src/sdk/Makefile.am +@@ -86,7 +86,7 @@ resource_dump_sdk_so_DEPS = \ + + # if !WIN_BUILD + libresource_dump_sdk.so: libresource_dump_sdk.la +- $(CC) -Wall -pthread -shared ${CFLAGS} $(COMPILER_FPIC) libresource_dump_sdk_la-resource_dump_sdk.o \ ++ $(CC) -Wall -pthread -shared -Wl,-z,now -Wl,${CFLAGS} $(COMPILER_FPIC) libresource_dump_sdk_la-resource_dump_sdk.o \ + -o libresource_dump_sdk.so ${AM_LDFLAGS} $(resource_dump_sdk_so_DEPS) + # else + # libresource_dump_sdk.dll: libresource_dump_sdk.la +-- +2.45.0 + diff --git a/add-default-link-flags-for-shared-libraries.patch b/add-default-link-flags-for-shared-libraries.patch index 9ebbf7f..d3abf76 100644 --- a/add-default-link-flags-for-shared-libraries.patch +++ b/add-default-link-flags-for-shared-libraries.patch @@ -1,52 +1,67 @@ +From a91f8252d007aa0d8b2d211ea0061a60ad003c73 Mon Sep 17 00:00:00 2001 +From: Kamal Heib +Date: Tue, 17 Oct 2023 14:19:52 -0400 +Subject: [PATCH] Add default link flags for shared libraries + +Signed-off-by: Kamal Heib +--- + cmdif/Makefile.am | 2 +- + dev_mgt/Makefile.am | 2 +- + mtcr_py/Makefile.am | 2 +- + reg_access/Makefile.am | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + diff --git a/cmdif/Makefile.am b/cmdif/Makefile.am -index 9807603..b23bcb9 100644 +index 7bb332aada48..3ffdf7d6653e 100644 --- a/cmdif/Makefile.am +++ b/cmdif/Makefile.am -@@ -51,7 +51,7 @@ libcmdif_a_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common.h +@@ -53,7 +53,7 @@ libcmdif_la_SOURCES = tools_cif.c tools_cif.h icmd_cif_common.c icmd_cif_common. cmdif_pylibdir = $(libdir)/mstflint/python_tools/ cmdif_pylib_DATA = ${CCMDIF_SO} cmdif.py - ${CCMDIF_SO}: libcmdif.a + ${CCMDIF_SO}: libcmdif.la - $(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 + $(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a CLEANFILES = ${CCMDIF_SO} diff --git a/dev_mgt/Makefile.am b/dev_mgt/Makefile.am -index 1fbd142..df5b14a 100644 +index a5f66e9fd935..0d1417daa647 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 +@@ -50,7 +50,7 @@ dev_mgt_pylib_DATA = c_dev_mgt.so dist_dev_mgt_pylib_DATA = dev_mgt.py - c_dev_mgt.so: libdev_mgt.a + c_dev_mgt.so: libdev_mgt.la - $(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 + $(top_builddir)/reg_access/.libs/libreg_access.a \ + $(top_builddir)/tools_layouts/.libs/libtools_layouts.a \ + $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a diff --git a/mtcr_py/Makefile.am b/mtcr_py/Makefile.am -index 934b803..c8af0c2 100644 +index 46fa4e60916d..2f431156a45e 100644 --- a/mtcr_py/Makefile.am +++ b/mtcr_py/Makefile.am -@@ -40,7 +40,7 @@ MTCR_DIR = $(USER_DIR)/${MTCR_CONF_DIR} - mtcr_pylib_DATA = cmtcr.so mtcr.py +@@ -35,6 +35,6 @@ mtcr_pylibdir = $(libdir)/mstflint/python_tools/ + 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) -+ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} $(MTCR_DIR)/*.o -o cmtcr.so $(MFT_CORE_LIB_LINK) +- $(CC) -g -Wall -pthread -shared ${CFLAGS} -o cmtcr.so -Wl,--whole-archive $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a -Wl,--no-whole-archive ++ $(CC) -g -Wall -pthread -shared ${CFLAGS} ${LDFLAGS} -o cmtcr.so -Wl,--whole-archive $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a -Wl,--no-whole-archive CLEANFILES = cmtcr.so - diff --git a/reg_access/Makefile.am b/reg_access/Makefile.am -index 26f6a5a..9a42c37 100644 +index 8e38c473cc9c..6228b45af312 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 +@@ -57,7 +57,7 @@ reg_access_pylib_DATA = ${RREG_ACCESS_SO} + dist_reg_access_pylib_DATA = regaccess.py regaccess_hca_ext_structs.py regaccess_switch_ext_structs.py - ${RREG_ACCESS_SO}: libreg_access.a + ${RREG_ACCESS_SO}: libreg_access.la - $(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 -lmlxconfig_4th_gen_layouts -L$(MTCR_DIR) -lmtcr_ul + $(top_builddir)/tools_layouts/.libs/libtools_layouts.a $(top_builddir)/${MTCR_CONF_DIR}/.libs/libmtcr_ul.a CLEANFILES = ${RREG_ACCESS_SO} +-- +2.44.0 + diff --git a/mstflint.spec b/mstflint.spec index 37109e7..a3a2ea9 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -2,15 +2,19 @@ Name: mstflint Summary: Mellanox firmware burning tool -Version: 4.24.0 +Version: 4.29.0 Release: %autorelease -License: GPLv2+ or BSD +# COPYING says the license is your choice of OpenIB.org BSD or GPLv2. +# kernel/Makefile has the 3-clause BSD. +# ext_libs/{iniParser,json,muparser}/ have MIT. +# ext_libs/sqlite/ has the SQLite blessing. +License: (GPL-2.0-only OR Linux-OpenIB) AND BSD-3-Clause AND MIT AND blessing Url: https://github.com/Mellanox/%{name} Source0: https://github.com/Mellanox/%{name}/releases/download/v%{version}-1/%{name}-%{version}-1.tar.gz Group: Applications/System -Patch4: add-default-link-flags-for-shared-libraries.patch -Patch6: replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch +Patch1: 0001-Fix-bind-now-test.patch +Patch4: add-default-link-flags-for-shared-libraries.patch BuildRequires: make BuildRequires: libstdc++-devel, zlib-devel, libibmad-devel, gcc-c++, gcc @@ -30,8 +34,8 @@ for network adapters based on Mellanox Technologies chips. %prep %setup -q -n %{name}-%{version} -%patch4 -p1 -%patch6 -p1 +%patch -P1 -p1 +%patch -P4 -p1 find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' @@ -40,7 +44,7 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' %if %{__remake_config} ./autogen.sh %endif -%configure --enable-fw-mgr --enable-adb-generic-tools +%configure --enable-adb-generic-tools --disable-openssl %make_build %install @@ -48,16 +52,16 @@ find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';' # 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 '*.a' -delete +find %{buildroot} -type f,l -name '*.a' -delete # Mark these shared libs executable for find-debuginfo.sh to find them. # https://docs.fedoraproject.org/en-US/packaging-guidelines/Debuginfo/ chmod +x %{buildroot}/%{_libdir}/mstflint/python_tools/*.so +chmod +x %{buildroot}/%{_libdir}/mstflint/sdk/*.so %files %doc README %_bindir/* -%{_sysconfdir}/mstflint %{_libdir}/mstflint %{_datadir}/mstflint diff --git a/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch b/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch deleted file mode 100644 index d24ef01..0000000 --- a/replace-mlxfwreset-with-mstfwreset-in-mstflint-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/flint/subcommands.cpp b/flint/subcommands.cpp -index 420b82f..0a20bcd 100644 ---- a/flint/subcommands.cpp -+++ b/flint/subcommands.cpp -@@ -4484,7 +4484,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/mlxfwops/lib/flint_base.h b/mlxfwops/lib/flint_base.h -index f3edc43..a85e43d 100644 ---- a/mlxfwops/lib/flint_base.h -+++ b/mlxfwops/lib/flint_base.h -@@ -364,7 +364,7 @@ struct GPH { - - #define REBOOT_REQUIRED_STR "To load new FW run reboot machine." - #ifndef MST_UL --#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mlxfwreset or reboot machine." -+#define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine." - #else - #define REBOOT_OR_FWRESET_REQUIRED_STR "To load new FW run mstfwreset or reboot machine." - #endif diff --git a/sources b/sources index 11476a8..7ff7d14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mstflint-4.24.0-1.tar.gz) = 143dd558e9b57e26d25459885957422b650dc2cdc5b0069b77d1cda07d3da4161a57b10b7d38fffe609c23c7905611ec04834f9c06174a7ba7462dd71085c3b5 +SHA512 (mstflint-4.29.0-1.tar.gz) = 33e889feb97e86cfaf095a4224c63015363f38f595bf84b0c7d409359388b6c1fd1e36ab59f995b57ea0d9e3eb686c486bba8047b4cbe75a3829ca1b28ea3976