forked from pool/mstflint
Accepting request 650123 from science:HPC
- Add Fixed-licenses-of-files.patch from upstream that fixes license issues (bsc#1086923) - Update to v4.10.0-3 (fate#325998) - Added mstcongestion - Add fix-race-condition-during-install.patch to fix install on parallel builds - Update to v4.10.0-2 - mstfwreset not supported - mstflint now handles all the burn parameters when MCC is enabled and displays the secure-FW CS tokens. - mstconfig - Added the option to query partial parameters - Added the following new parameters: FLEX_PARSER_PROFILE_ENABLE ECPF_ESWITCH_MANAGER ECPF_PAGE_SUPPLIER SAFE_MODE_ENABLE SAFE_MODE_THERSHOLD BOOT_UNDI_NETWORK_WAIT - Fixed bug in firmware burning flow - Refresh patchest against latest sources: - Remove-date-time-info-from-build.patch - Add-s390-s390x-support.patch - Add-armv6-and-armv7-support.patch - Fix-gcc7-and-gcc8.patch OBS-URL: https://build.opensuse.org/request/show/650123 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=14
This commit is contained in:
commit
efcf696bf5
@ -1,4 +1,4 @@
|
||||
commit 3178d1cabfcf49959ed196bc599aa13f0a21b3fe
|
||||
commit f7cad05810d6e8ab9a0344833a97407765e18970
|
||||
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
Date: Thu May 18 11:20:20 2017 +0200
|
||||
|
||||
@ -7,7 +7,7 @@ Date: Thu May 18 11:20:20 2017 +0200
|
||||
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
|
||||
diff --git common/compatibility.h common/compatibility.h
|
||||
index c034df383ebe..c17eae907d76 100644
|
||||
index b187938ae0af..5e8a7f35afb5 100644
|
||||
--- common/compatibility.h
|
||||
+++ common/compatibility.h
|
||||
@@ -59,6 +59,8 @@
|
||||
@ -15,7 +15,7 @@ index c034df383ebe..c17eae907d76 100644
|
||||
# elif defined(__PPC__)
|
||||
# define ARCH_ppc
|
||||
+# elif defined(__ARM_ARCH_7A__)
|
||||
+# define ARCH_armv7
|
||||
+# define ARCH_arm7
|
||||
# elif defined(__aarch64__)
|
||||
# define ARCH_arm64
|
||||
# elif defined(__arm__)
|
||||
@ -24,12 +24,12 @@ index c034df383ebe..c17eae907d76 100644
|
||||
#define U8H_FMT "0x%02x"
|
||||
|
||||
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390)
|
||||
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__)
|
||||
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) || defined(ARCH_arm7)
|
||||
# if defined(__MINGW32__) || defined(__MINGW64__)
|
||||
# include <inttypes.h>
|
||||
# define U64D_FMT "0x%" PRId64
|
||||
diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h
|
||||
index 5728fc7fdd6e..213f227d9123 100644
|
||||
index 68a08d0589ae..7974c12cb743 100644
|
||||
--- mtcr_ul/packets_common.h
|
||||
+++ mtcr_ul/packets_common.h
|
||||
@@ -148,6 +148,8 @@
|
||||
@ -37,40 +37,38 @@ index 5728fc7fdd6e..213f227d9123 100644
|
||||
# elif defined(__PPC__)
|
||||
# define ARCH_ppc
|
||||
+# elif defined(__ARM_ARCH_7A__)
|
||||
+# define ARCH_armv7
|
||||
+# define ARCH_arm7
|
||||
# elif defined(__aarch64__)
|
||||
# define ARCH_arm64
|
||||
# elif defined(__arm__)
|
||||
@@ -178,7 +180,7 @@
|
||||
# define U8H_FMT "0x%02x"
|
||||
# define U32D_FMT "%u"
|
||||
# define STR_FMT "%s"
|
||||
-#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390)
|
||||
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__)
|
||||
# define U64H_FMT "0x%016llx"
|
||||
# define U64D_FMT "%llu"
|
||||
# define U32H_FMT "0x%08x"
|
||||
@@ -169,7 +171,7 @@
|
||||
/* define macros for print fields */
|
||||
//#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_s390x)
|
||||
/*
|
||||
- #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_s390x))
|
||||
+ #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_s390x) || defined(ARCH_arm7))
|
||||
# define U64H_FMT "0x%016lx"
|
||||
# define U64D_FMT "%lu"
|
||||
# define U32H_FMT "0x%08x"
|
||||
diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h
|
||||
index 26adb09bec01..0db09f24c62c 100644
|
||||
index 0a5cee5fec54..bff7c458915e 100644
|
||||
--- tools_layouts/adb_to_c_utils.h
|
||||
+++ tools_layouts/adb_to_c_utils.h
|
||||
@@ -137,6 +137,10 @@ extern "C" {
|
||||
@@ -133,6 +133,8 @@ extern "C" {
|
||||
# define ARCH_ppc64
|
||||
# elif defined(__PPC__)
|
||||
# define ARCH_ppc
|
||||
+# elif defined(__ARM_ARCH_7A__)
|
||||
+# define ARCH_arm7
|
||||
# elif defined(__aarch64__)
|
||||
# define ARCH_arm64
|
||||
+# elif defined(__ARM_ARCH_7A__)
|
||||
+# define ARCH_armv7
|
||||
+# elif defined(__arm__)
|
||||
+# define ARCH_arm6l
|
||||
# elif defined(__s390x__)
|
||||
# define ARCH_s390x
|
||||
# elif defined(__s390__)
|
||||
@@ -177,7 +181,7 @@ extern "C" {
|
||||
# define U64D_FMT "%lu"
|
||||
# define U64H_FMT "0x%016lx"
|
||||
# define U48H_FMT "0x%012lx"
|
||||
-#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390)
|
||||
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) || defined(__arm__)
|
||||
# elif defined(__arm__)
|
||||
@@ -173,7 +175,7 @@ extern "C" {
|
||||
#define U16H_FMT "0x%04x"
|
||||
#define U8H_FMT "0x%02x"
|
||||
|
||||
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390)
|
||||
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_arm7) || defined(ARCH_s390)
|
||||
# if defined(__MINGW32__) || defined(__MINGW64__)
|
||||
# include <inttypes.h>
|
||||
# define U64D_FMT "0x%" PRId64
|
||||
|
@ -1,4 +1,4 @@
|
||||
commit 1566087c13fa7e9aab45c57f9cf83390e8c0afa6
|
||||
commit 3a4c85109e8e1a7062e1efcf0279843ee419f1c2
|
||||
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
Date: Thu May 18 11:17:54 2017 +0200
|
||||
|
||||
@ -7,7 +7,7 @@ Date: Thu May 18 11:17:54 2017 +0200
|
||||
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
|
||||
diff --git common/compatibility.h common/compatibility.h
|
||||
index ea320d9ed1da..c034df383ebe 100644
|
||||
index 79414719265c..b187938ae0af 100644
|
||||
--- common/compatibility.h
|
||||
+++ common/compatibility.h
|
||||
@@ -63,6 +63,10 @@
|
||||
@ -34,13 +34,13 @@ index ea320d9ed1da..c034df383ebe 100644
|
||||
# define U48H_FMT "0x%012llx"
|
||||
# define U64D_FMT_GEN "llu"
|
||||
# endif
|
||||
-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
|
||||
+#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_s390x)
|
||||
-#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
|
||||
+#elif defined(ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_s390x)
|
||||
# define U64D_FMT "%lu"
|
||||
# define U64H_FMT "0x%016lx"
|
||||
# define U48H_FMT "0x%012lx"
|
||||
diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h
|
||||
index 453c26fa12f9..5728fc7fdd6e 100644
|
||||
index 4df05efaa9c2..68a08d0589ae 100644
|
||||
--- mtcr_ul/packets_common.h
|
||||
+++ mtcr_ul/packets_common.h
|
||||
@@ -152,6 +152,10 @@
|
||||
@ -54,35 +54,35 @@ index 453c26fa12f9..5728fc7fdd6e 100644
|
||||
# else
|
||||
# error Unknown CPU architecture using the linux OS
|
||||
# endif
|
||||
@@ -164,9 +168,9 @@
|
||||
@@ -163,9 +167,9 @@
|
||||
|
||||
/**********************************/
|
||||
/* define macros for print fields */
|
||||
-//#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)
|
||||
+//#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_s390x)
|
||||
/*
|
||||
-#if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__))
|
||||
+#if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__)) || defined(ARCH_s390x)
|
||||
# define U64H_FMT "0x%016lx"
|
||||
# define U64D_FMT "%lu"
|
||||
# define U32H_FMT "0x%08x"
|
||||
@@ -174,7 +178,7 @@
|
||||
# define U8H_FMT "0x%02x"
|
||||
# define U32D_FMT "%u"
|
||||
# define STR_FMT "%s"
|
||||
-#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l)
|
||||
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390)
|
||||
# define U64H_FMT "0x%016llx"
|
||||
# define U64D_FMT "%llu"
|
||||
# define U32H_FMT "0x%08x"
|
||||
- #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__))
|
||||
+ #if !defined(UEFI_BUILD) && (defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(__MINGW64__) || defined(ARCH_s390x))
|
||||
# define U64H_FMT "0x%016lx"
|
||||
# define U64D_FMT "%lu"
|
||||
# define U32H_FMT "0x%08x"
|
||||
@@ -173,7 +177,7 @@
|
||||
# define U8H_FMT "0x%02x"
|
||||
# define U32D_FMT "%u"
|
||||
# define STR_FMT "%s"
|
||||
- #elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l)
|
||||
+ #elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_arm6l)) || defined(ARCH_s390)
|
||||
# define U64H_FMT "0x%016llx"
|
||||
# define U64D_FMT "%llu"
|
||||
# define U32H_FMT "0x%08x"
|
||||
diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h
|
||||
index 6268b69b2e87..26adb09bec01 100644
|
||||
index 19ffab03aba3..0a5cee5fec54 100644
|
||||
--- tools_layouts/adb_to_c_utils.h
|
||||
+++ tools_layouts/adb_to_c_utils.h
|
||||
@@ -137,6 +137,10 @@ extern "C" {
|
||||
# define ARCH_ppc
|
||||
# elif defined(__aarch64__)
|
||||
# define ARCH_arm64
|
||||
# elif defined(__arm__)
|
||||
# define ARCH_arm6l
|
||||
+# elif defined(__s390x__)
|
||||
+# define ARCH_s390x
|
||||
+# elif defined(__s390__)
|
||||
@ -90,27 +90,21 @@ index 6268b69b2e87..26adb09bec01 100644
|
||||
# else
|
||||
# error Unknown CPU architecture using the linux OS
|
||||
# endif
|
||||
@@ -169,7 +173,11 @@ extern "C" {
|
||||
@@ -169,7 +173,7 @@ extern "C" {
|
||||
#define U16H_FMT "0x%04x"
|
||||
#define U8H_FMT "0x%02x"
|
||||
|
||||
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD)
|
||||
+#if defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_s390x)
|
||||
+# define U64D_FMT "%lu"
|
||||
+# define U64H_FMT "0x%016lx"
|
||||
+# define U48H_FMT "0x%012lx"
|
||||
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390)
|
||||
-#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l)
|
||||
+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_arm6l) || defined(ARCH_s390)
|
||||
# if defined(__MINGW32__) || defined(__MINGW64__)
|
||||
# include <inttypes.h>
|
||||
# define U64D_FMT "0x%" PRId64
|
||||
@@ -180,10 +188,6 @@ extern "C" {
|
||||
@@ -180,7 +184,7 @@ extern "C" {
|
||||
# define U64H_FMT "0x%016llx"
|
||||
# define U48H_FMT "0x%012llx"
|
||||
# endif
|
||||
-#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64)
|
||||
-# define U64D_FMT "%lu"
|
||||
-# define U64H_FMT "0x%016lx"
|
||||
-# define U48H_FMT "0x%012lx"
|
||||
#else
|
||||
# error Unknown architecture
|
||||
#endif /* ARCH */
|
||||
+#elif defined (ARCH_ia64) || defined(ARCH_x86_64) || defined(ARCH_ppc64) || defined(ARCH_arm64) || defined(ARCH_s390x)
|
||||
# define U64D_FMT "%lu"
|
||||
# define U64H_FMT "0x%016lx"
|
||||
# define U48H_FMT "0x%012lx"
|
||||
|
@ -1,4 +1,4 @@
|
||||
commit eff41e6dc73e6f38e50296d1579372f7527fb84b
|
||||
commit 6bc135ffb198d601e9c4e3be615f13a98640610b
|
||||
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
Date: Wed Aug 9 17:31:57 2017 +0200
|
||||
|
||||
@ -9,10 +9,10 @@ Date: Wed Aug 9 17:31:57 2017 +0200
|
||||
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
|
||||
diff --git configure.ac configure.ac
|
||||
index 1aa9d36d5356..ca08a19c8805 100644
|
||||
index 5a410606edcc..d76f6ae6df43 100644
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -164,16 +164,21 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
|
||||
@@ -164,14 +164,15 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
|
||||
])
|
||||
|
||||
CFLAGS="$CFLAGS -Werror -DMST_UL"
|
||||
@ -21,19 +21,13 @@ index 1aa9d36d5356..ca08a19c8805 100644
|
||||
|
||||
AC_CONFIG_FILES( mstflint.spec )
|
||||
|
||||
#Check for new ignore flags needed for GCC >= 7
|
||||
+AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CPPFLAGS="$CPPFLAGS -Wno-implicit-fallthrough"], [], [])
|
||||
+AX_CHECK_COMPILE_FLAG([-Wno-format-overflow], [CPPFLAGS="$CPPFLAGS -Wno-format-overflow"], [], [])
|
||||
+AX_CHECK_COMPILE_FLAG([-Wno-cast-function-type], [CPPFLAGS="$CPPFLAGS -Wno-cast-function-type"], [], [])
|
||||
+
|
||||
+AC_LANG_PUSH([C++])
|
||||
AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough], [CXXFLAGS="$CXXFLAGS -Wno-implicit-fallthrough"], [], [])
|
||||
# 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-format-overflow], [CXXFLAGS="$CXXFLAGS -Wno-format-overflow"], [], [])
|
||||
-
|
||||
+AX_CHECK_COMPILE_FLAG([-Wno-class-memaccess], [CXXFLAGS="$CXXFLAGS -Wno-class-memaccess"], [], [])
|
||||
+AC_LANG_POP([C++])
|
||||
-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"], [], [])
|
||||
|
||||
TOOLS_BUILD_TIME=`date +"%b %d %Y\, %H:%M:%S"`
|
||||
AC_SUBST(TOOLS_BUILD_TIME)
|
||||
# C++ related ignores
|
||||
AC_LANG_PUSH([C++])
|
||||
|
105
Fixed-licenses-of-files.patch
Normal file
105
Fixed-licenses-of-files.patch
Normal file
@ -0,0 +1,105 @@
|
||||
commit 053e885be87acdb3a080ff872bc73c495a40042e
|
||||
Author: Dan Goldberg <dang@mellanox.com>
|
||||
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 <nmoreychaisemartin@suse.com>
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
commit a660f8e5dbc67fefa1b09837d33d986eb1971ec0
|
||||
commit 206dbe6dbb96cb8fc1b6ee8c5ffe52496b30762b
|
||||
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
Date: Thu May 18 07:48:13 2017 +0200
|
||||
|
||||
@ -7,18 +7,18 @@ Date: Thu May 18 07:48:13 2017 +0200
|
||||
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
|
||||
|
||||
diff --git common/tools_version.h common/tools_version.h
|
||||
index 7fdb366446ce..dd2f5fb8850d 100644
|
||||
index 4d31d97daf18..0c5da29bf700 100644
|
||||
--- common/tools_version.h
|
||||
+++ common/tools_version.h
|
||||
@@ -70,10 +70,8 @@ int get_version_string(char* buf, int buf_size, const char* exe_name, const char
|
||||
@@ -71,10 +71,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,
|
||||
- __DATE__,
|
||||
- __TIME__,
|
||||
TOOLS_GIT_SHA);
|
||||
+ len += snprintf(buf + len, buf_size - len, "%s. Git SHA Hash: %s",
|
||||
MFT_VERSION_STR,
|
||||
- __DATE__,
|
||||
- __TIME__,
|
||||
TOOLS_GIT_SHA);
|
||||
return len;
|
||||
}
|
||||
|
21
fix-race-condition-during-install.patch
Normal file
21
fix-race-condition-during-install.patch
Normal file
@ -0,0 +1,21 @@
|
||||
commit ae53145a2bacf2574acd9c6df555b40cc5e08fed
|
||||
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||
Date: Mon Oct 15 09:33:09 2018 +0200
|
||||
|
||||
fix race condition during install
|
||||
|
||||
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||
|
||||
diff --git dev_mgt/Makefile.am dev_mgt/Makefile.am
|
||||
index 907e5ce38a0b..28d506d095fb 100644
|
||||
--- dev_mgt/Makefile.am
|
||||
+++ dev_mgt/Makefile.am
|
||||
@@ -46,7 +46,7 @@ libdev_mgt_a_SOURCES = \
|
||||
|
||||
dev_mgt_pylibdir = $(libdir)/mstflint/python_tools/
|
||||
|
||||
-dev_mgt_pylib_DATA = c_dev_mgt.so dev_mgt.py
|
||||
+dev_mgt_pylib_DATA = c_dev_mgt.so
|
||||
dist_dev_mgt_pylib_DATA = dev_mgt.py
|
||||
|
||||
c_dev_mgt.so: libdev_mgt.a
|
3
mstflint-4.10.0-3.tar.gz
Normal file
3
mstflint-4.10.0-3.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:75e4241c9745c22ed7504870b77621307f170890e933d7d377087480b5a04600
|
||||
size 4024698
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d484f07c53f851cf39f9f9bf2f15e0a81a64cf53bdd666a5456729acebea0bc8
|
||||
size 4049246
|
@ -1,3 +1,40 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 19 07:52:54 UTC 2018 - nmoreychaisemartin@suse.com
|
||||
|
||||
- Add Fixed-licenses-of-files.patch from upstream that
|
||||
fixes license issues (bsc#1086923)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 15 07:35:36 UTC 2018 - nmoreychaisemartin@suse.com
|
||||
|
||||
- Update to v4.10.0-3 (fate#325998)
|
||||
- Added mstcongestion
|
||||
- Add fix-race-condition-during-install.patch
|
||||
to fix install on parallel builds
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 31 07:45:02 UTC 2018 - nmoreychaisemartin@suse.com
|
||||
|
||||
- Update to v4.10.0-2
|
||||
- mstfwreset not supported
|
||||
- mstflint now handles all the burn parameters when MCC
|
||||
is enabled and displays the secure-FW CS tokens.
|
||||
- mstconfig
|
||||
- Added the option to query partial parameters
|
||||
- Added the following new parameters:
|
||||
FLEX_PARSER_PROFILE_ENABLE
|
||||
ECPF_ESWITCH_MANAGER
|
||||
ECPF_PAGE_SUPPLIER
|
||||
SAFE_MODE_ENABLE
|
||||
SAFE_MODE_THERSHOLD
|
||||
BOOT_UNDI_NETWORK_WAIT
|
||||
- Fixed bug in firmware burning flow
|
||||
- Refresh patchest against latest sources:
|
||||
- Remove-date-time-info-from-build.patch
|
||||
- Add-s390-s390x-support.patch
|
||||
- Add-armv6-and-armv7-support.patch
|
||||
- Fix-gcc7-and-gcc8.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 18 06:31:30 UTC 2018 - nmoreychaisemartin@suse.com
|
||||
|
||||
|
@ -19,18 +19,20 @@
|
||||
%define extra_version -3
|
||||
|
||||
Name: mstflint
|
||||
Version: 4.9.0
|
||||
Version: 4.10.0
|
||||
Release: 0
|
||||
Summary: Mellanox Firmware Burning and Diagnostics Tools
|
||||
License: GPL-2.0-only OR BSD-2-Clause
|
||||
Group: System/Console
|
||||
Url: http://www.openfabrics.org
|
||||
Obsoletes: mstflint-devel < %{version}
|
||||
Source: https://github.com/Mellanox/mstflint/releases/download/v%{version}%{extra_version}/mstflint-%{version}.tar.gz
|
||||
Source: https://github.com/Mellanox/mstflint/releases/download/v%{version}%{extra_version}/mstflint-%{version}%{extra_version}.tar.gz
|
||||
Patch1: Remove-date-time-info-from-build.patch
|
||||
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
|
||||
@ -53,6 +55,8 @@ the downloads page at the Mellanox web site.
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
%patch6
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
@ -69,6 +73,7 @@ rm -rf %{buildroot}%{_bindir}/hca_self_test.ofed
|
||||
%defattr(-, root, root)
|
||||
%doc README COPYING LICENSE
|
||||
%{_bindir}/mstconfig
|
||||
%{_bindir}/mstcongestion
|
||||
%{_bindir}/mstflint
|
||||
%{_bindir}/mstfwreset
|
||||
%{_bindir}/mstmcra
|
||||
|
Loading…
Reference in New Issue
Block a user