From de3bdd477186ffc9eb98fcaac8ea0a9ce65baa735a9c41f23f4d3023fd94350d Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 14 Feb 2019 06:54:30 +0000 Subject: [PATCH] Accepting request 674852 from home:NMoreyChaisemartin:branches:science:HPC - Update to v4.11.0-3 (bsc#1103497) - Added option to query only flashed FW version, which reduces the CPU usage during the query. To use this option you should use "--next_boot_fw_ver" flag. - Fixed issue of missing information during query. - Added support for python 3. - Added option to reduce cpu utilization with "--low_cpu" flag. - Added compatibility to 1.1.X version, in addition to previously supported 1.0.2 version. - Added support for Mellanox Quantum switch systems and ConnectX-6 Ready adapter cards. - mstarchive tool The mstarchive tool allows the user to create a file with the mfa2 extension. The new file contains several binary files of a given firmware for different adapter cards. - mstprivhost The ability to restrict the hosts from configuring the NIC. Meaning, only the Arm side will have the privilege to configure the NIC. Note: This utility is supported in BlueField devices only. - mstconfig in BlueField Enables the user to manage (grand/restrict) mlxconfig configuration privileges for BlueField Arm systems. - Refresh patchest against latest sources: - Add-armv6-and-armv7-support.patch - Add-s390-s390x-support.patch - Fix-gcc7-and-gcc8.patch - Remove-date-time-info-from-build.patch - fix-race-condition-during-install.patch - Drop Fixed-licenses-of-files.patch as it was merged upstream OBS-URL: https://build.opensuse.org/request/show/674852 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=31 --- Add-armv6-and-armv7-support.patch | 2 +- Add-s390-s390x-support.patch | 2 +- Fix-gcc7-and-gcc8.patch | 23 ++---- Fixed-licenses-of-files.patch | 105 ------------------------ Remove-date-time-info-from-build.patch | 8 +- fix-race-condition-during-install.patch | 2 +- mstflint-4.10.0-3.tar.gz | 3 - mstflint-4.11.0-3.tar.gz | 3 + mstflint.changes | 31 +++++++ mstflint.spec | 8 +- 10 files changed, 51 insertions(+), 136 deletions(-) delete mode 100644 Fixed-licenses-of-files.patch delete mode 100644 mstflint-4.10.0-3.tar.gz create mode 100644 mstflint-4.11.0-3.tar.gz diff --git a/Add-armv6-and-armv7-support.patch b/Add-armv6-and-armv7-support.patch index 84ca68e..4a02178 100644 --- a/Add-armv6-and-armv7-support.patch +++ b/Add-armv6-and-armv7-support.patch @@ -1,4 +1,4 @@ -commit f7cad05810d6e8ab9a0344833a97407765e18970 +commit dfa4e356197a42f339fd873acd90944d7c8b896c Author: Nicolas Morey-Chaisemartin Date: Thu May 18 11:20:20 2017 +0200 diff --git a/Add-s390-s390x-support.patch b/Add-s390-s390x-support.patch index 01c2634..262c490 100644 --- a/Add-s390-s390x-support.patch +++ b/Add-s390-s390x-support.patch @@ -1,4 +1,4 @@ -commit 3a4c85109e8e1a7062e1efcf0279843ee419f1c2 +commit fcbb58df88e9a209b17b815c106768b5cc50d777 Author: Nicolas Morey-Chaisemartin Date: Thu May 18 11:17:54 2017 +0200 diff --git a/Fix-gcc7-and-gcc8.patch b/Fix-gcc7-and-gcc8.patch index 7c05c30..4ab838e 100644 --- a/Fix-gcc7-and-gcc8.patch +++ b/Fix-gcc7-and-gcc8.patch @@ -1,4 +1,4 @@ -commit 6bc135ffb198d601e9c4e3be615f13a98640610b +commit e7d0414f37970dc7bf0770459760fc7a55a5aa95 Author: Nicolas Morey-Chaisemartin Date: Wed Aug 9 17:31:57 2017 +0200 @@ -9,25 +9,14 @@ Date: Wed Aug 9 17:31:57 2017 +0200 Signed-off-by: Nicolas Morey-Chaisemartin diff --git configure.ac configure.ac -index 5a410606edcc..d76f6ae6df43 100644 +index 78a3b48c5331..4e31ac8794e4 100644 --- configure.ac +++ configure.ac -@@ -164,14 +164,15 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [ +@@ -166,6 +166,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [ ]) - CFLAGS="$CFLAGS -Werror -DMST_UL" + CFLAGS="$CFLAGS -DMST_UL" +CPPFLAGS="$CPPFLAGS -DMST_UL" - CXXFLAGS="$CXXFLAGS -Werror -DMST_UL" + CXXFLAGS="$CXXFLAGS -DMST_UL" - AC_CONFIG_FILES( mstflint.spec ) - - # C related ignores --AX_CHECK_COMPILE_FLAG([-Wno-format-overflow], [CFLAGS="$CFLAGS -Wno-format-overflow"], [], []) --AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CFLAGS="$CFLAGS -Wno-implicit-fallthrough"], [], []) --AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CFLAGS="$CFLAGS -Wno-cast-function-type"], [], []) -+AX_CHECK_COMPILE_FLAG([-Wno-format-overflow], [CPPFLAGS="$CPPFLAGS -Wno-format-overflow"], [], []) -+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CPPFLAGS="$CPPFLAGS -Wno-implicit-fallthrough"], [], []) -+AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CPPFLAGS="$CPPFLAGS -Wno-cast-function-type"], [], []) - - # C++ related ignores - AC_LANG_PUSH([C++]) + AM_CFLAGS="-Wall -Werror" diff --git a/Fixed-licenses-of-files.patch b/Fixed-licenses-of-files.patch deleted file mode 100644 index f31a856..0000000 --- a/Fixed-licenses-of-files.patch +++ /dev/null @@ -1,105 +0,0 @@ -commit 053e885be87acdb3a080ff872bc73c495a40042e -Author: Dan Goldberg -Date: Sun Nov 18 10:57:18 2018 +0200 - - Fixed licenses of files. - - The license of mstflint is GPL/BSD. - All of the files were aligned accordingly. - - Signed-off-by: Nicolas Morey-Chaisemartin - -diff --git tools_layouts/reg_access_hca_layouts.c tools_layouts/reg_access_hca_layouts.c -index 47f6c3fb5e27..ad43dba8fa14 100644 ---- tools_layouts/reg_access_hca_layouts.c -+++ tools_layouts/reg_access_hca_layouts.c -@@ -1,15 +1,34 @@ - --/* - Mellanox Confidential and Proprietary - -+/* -+ * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. - * -- * Copyright (C) 2010-2011, 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: - * -- * Except as specifically permitted herein, no portion of the information, -- * including but not limited to object code and source code, may be reproduced, -- * modified, distributed, republished or otherwise exploited in any form or by -- * any means for any purpose without the prior written permission of Mellanox -- * Technologies Ltd. Use of software subject to the terms and conditions -- * detailed in the file "LICENSE.txt". -+ * 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. - */ - - -diff --git tools_layouts/reg_access_hca_layouts.h tools_layouts/reg_access_hca_layouts.h -index 8748ed60267c..2bf71de10e5a 100644 ---- tools_layouts/reg_access_hca_layouts.h -+++ tools_layouts/reg_access_hca_layouts.h -@@ -1,15 +1,34 @@ - --/* - Mellanox Confidential and Proprietary - -+/* -+ * Copyright (C) Jan 2013 Mellanox Technologies Ltd. All rights reserved. - * -- * Copyright (C) 2010-2011, 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: - * -- * Except as specifically permitted herein, no portion of the information, -- * including but not limited to object code and source code, may be reproduced, -- * modified, distributed, republished or otherwise exploited in any form or by -- * any means for any purpose without the prior written permission of Mellanox -- * Technologies Ltd. Use of software subject to the terms and conditions -- * detailed in the file "LICENSE.txt". -+ * 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. - */ - - diff --git a/Remove-date-time-info-from-build.patch b/Remove-date-time-info-from-build.patch index 53ef0f5..e0adb94 100644 --- a/Remove-date-time-info-from-build.patch +++ b/Remove-date-time-info-from-build.patch @@ -1,4 +1,4 @@ -commit 206dbe6dbb96cb8fc1b6ee8c5ffe52496b30762b +commit 4a3784b83558c46a62cddd4faa0639e8f8ffc46b Author: Nicolas Morey-Chaisemartin Date: Thu May 18 07:48:13 2017 +0200 @@ -7,16 +7,16 @@ Date: Thu May 18 07:48:13 2017 +0200 Signed-off-by: Nicolas Morey-Chaisemartin diff --git common/tools_version.h common/tools_version.h -index 4d31d97daf18..0c5da29bf700 100644 +index 2b6f16bf874e..5dc0239f31d6 100644 --- common/tools_version.h +++ common/tools_version.h -@@ -71,10 +71,8 @@ int get_version_string(char *buf, int buf_size, const char *exe_name, const char +@@ -75,10 +75,8 @@ int get_version_string(char *buf, int buf_size, const char *exe_name, const char 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", + len += snprintf(buf + len, buf_size - len, "%s. Git SHA Hash: %s", - MFT_VERSION_STR, + MSTFLINT_VERSION_STR, - __DATE__, - __TIME__, TOOLS_GIT_SHA); diff --git a/fix-race-condition-during-install.patch b/fix-race-condition-during-install.patch index 1c6ba27..f289db8 100644 --- a/fix-race-condition-during-install.patch +++ b/fix-race-condition-during-install.patch @@ -1,4 +1,4 @@ -commit ae53145a2bacf2574acd9c6df555b40cc5e08fed +commit 58b86ea0cba77004b59a87b6e1de253d93fde3c9 Author: Nicolas Morey-Chaisemartin Date: Mon Oct 15 09:33:09 2018 +0200 diff --git a/mstflint-4.10.0-3.tar.gz b/mstflint-4.10.0-3.tar.gz deleted file mode 100644 index cbdba88..0000000 --- a/mstflint-4.10.0-3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75e4241c9745c22ed7504870b77621307f170890e933d7d377087480b5a04600 -size 4024698 diff --git a/mstflint-4.11.0-3.tar.gz b/mstflint-4.11.0-3.tar.gz new file mode 100644 index 0000000..e313723 --- /dev/null +++ b/mstflint-4.11.0-3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede5f897b5a772ef35faa49a94517059510764b3d50df52b267555e17c0c6594 +size 4190692 diff --git a/mstflint.changes b/mstflint.changes index 073e458..6837690 100644 --- a/mstflint.changes +++ b/mstflint.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Wed Feb 13 13:11:34 UTC 2019 - nmoreychaisemartin@suse.com + +- Update to v4.11.0-3 (bsc#1103497) + - Added option to query only flashed FW version, which reduces the CPU usage during the query. + To use this option you should use "--next_boot_fw_ver" flag. + - Fixed issue of missing information during query. + - Added support for python 3. + - Added option to reduce cpu utilization with "--low_cpu" flag. + - Added compatibility to 1.1.X version, in addition to previously supported 1.0.2 version. + - Added support for Mellanox Quantum switch systems and + ConnectX-6 Ready adapter cards. + - mstarchive tool + The mstarchive tool allows the user to create a file with the mfa2 extension. + The new file contains several binary files of a given firmware for + different adapter cards. + - mstprivhost + The ability to restrict the hosts from configuring the NIC. + Meaning, only the Arm side will have the privilege to configure the NIC. + Note: This utility is supported in BlueField devices only. + - mstconfig in BlueField + Enables the user to manage (grand/restrict) mlxconfig configuration + privileges for BlueField Arm systems. +- Refresh patchest against latest sources: + - Add-armv6-and-armv7-support.patch + - Add-s390-s390x-support.patch + - Fix-gcc7-and-gcc8.patch + - Remove-date-time-info-from-build.patch + - fix-race-condition-during-install.patch +- Drop Fixed-licenses-of-files.patch as it was merged upstream + ------------------------------------------------------------------- Mon Nov 19 07:52:54 UTC 2018 - nmoreychaisemartin@suse.com diff --git a/mstflint.spec b/mstflint.spec index 9fbdbfc..35167f7 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -1,7 +1,7 @@ # # spec file for package mstflint # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define extra_version -3 Name: mstflint -Version: 4.10.0 +Version: 4.11.0 Release: 0 Summary: Mellanox Firmware Burning and Diagnostics Tools License: GPL-2.0-only OR BSD-2-Clause @@ -32,10 +32,10 @@ Patch2: Add-s390-s390x-support.patch Patch3: Add-armv6-and-armv7-support.patch Patch4: Fix-gcc7-and-gcc8.patch Patch5: fix-race-condition-during-install.patch -Patch6: Fixed-licenses-of-files.patch BuildRequires: gcc-c++ BuildRequires: infiniband-diags-devel BuildRequires: libibverbs-devel +BuildRequires: libopenssl-devel BuildRequires: libtool BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,6 @@ the downloads page at the Mellanox web site. %patch3 %patch4 %patch5 -%patch6 %build ./autogen.sh @@ -80,6 +79,7 @@ rm -rf %{buildroot}%{_bindir}/hca_self_test.ofed %{_bindir}/mstmread %{_bindir}/mstmtserver %{_bindir}/mstmwrite +%{_bindir}/mstprivhost %{_bindir}/mstregdump %{_bindir}/mstvpd %{_mandir}/man1/*.1%{ext_man}