Accepting request 728695 from science:HPC

OBS-URL: https://build.opensuse.org/request/show/728695
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2019-09-07 09:53:29 +00:00 committed by Git OBS Bridge
commit a4dc7b0c2b
9 changed files with 56 additions and 199 deletions

View File

@ -1,74 +0,0 @@
commit dfa4e356197a42f339fd873acd90944d7c8b896c
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu May 18 11:20:20 2017 +0200
Add armv6 and armv7 support
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
diff --git common/compatibility.h common/compatibility.h
index b187938ae0af..5e8a7f35afb5 100644
--- common/compatibility.h
+++ common/compatibility.h
@@ -59,6 +59,8 @@
# 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__)
@@ -98,7 +100,7 @@
#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_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 68a08d0589ae..7974c12cb743 100644
--- mtcr_ul/packets_common.h
+++ mtcr_ul/packets_common.h
@@ -148,6 +148,8 @@
# 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__)
@@ -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 0a5cee5fec54..bff7c458915e 100644
--- tools_layouts/adb_to_c_utils.h
+++ tools_layouts/adb_to_c_utils.h
@@ -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__)
@@ -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

View File

@ -1,110 +0,0 @@
commit fcbb58df88e9a209b17b815c106768b5cc50d777
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu May 18 11:17:54 2017 +0200
Add s390/s390x support
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
diff --git common/compatibility.h common/compatibility.h
index 79414719265c..b187938ae0af 100644
--- common/compatibility.h
+++ common/compatibility.h
@@ -63,6 +63,10 @@
# define ARCH_arm64
# elif defined(__arm__)
# define ARCH_arm6l
+# elif defined(__s390x__)
+# define ARCH_s390x
+# elif defined(__s390__)
+# define ARCH_s390
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -94,7 +98,7 @@
#define U16H_FMT "0x%04x"
#define U8H_FMT "0x%02x"
-#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
@@ -109,7 +113,7 @@
# 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)
# 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 4df05efaa9c2..68a08d0589ae 100644
--- mtcr_ul/packets_common.h
+++ mtcr_ul/packets_common.h
@@ -152,6 +152,10 @@
# define ARCH_arm64
# elif defined(__arm__)
# define ARCH_arm6l
+# elif defined(__s390x__)
+# define ARCH_s390x
+# elif defined(__s390__)
+# define ARCH_s390
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -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"
@@ -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 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_arm64
# elif defined(__arm__)
# define ARCH_arm6l
+# elif defined(__s390x__)
+# define ARCH_s390x
+# elif defined(__s390__)
+# define ARCH_s390
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -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) || 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,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)
+#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"

View File

@ -1,4 +1,4 @@
commit e7d0414f37970dc7bf0770459760fc7a55a5aa95
commit e325ecf9ecfabdb5ad5ad96f0ac025a2828b2dd3
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Wed Aug 9 17:31:57 2017 +0200
@ -9,14 +9,14 @@ 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 78a3b48c5331..4e31ac8794e4 100644
index 8840a41d8169..62aa0a738c2d 100644
--- configure.ac
+++ configure.ac
@@ -166,6 +166,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
])
@@ -246,6 +246,7 @@ AC_SEARCH_LIBS([sqlite3_initialize], [sqlite3], [SQLITE_SYSTEM_AVAILABLE="yes"],
AM_CONDITIONAL([USE_LOCAL_SQLITE], [test "$SQLITE_SYSTEM_AVAILABLE" = no])
CFLAGS="$CFLAGS -DMST_UL"
+CPPFLAGS="$CPPFLAGS -DMST_UL"
CXXFLAGS="$CXXFLAGS -DMST_UL"
AM_CFLAGS="-Wall -Werror"
AM_CFLAGS="-Wall"

View File

@ -1,4 +1,4 @@
commit 4a3784b83558c46a62cddd4faa0639e8f8ffc46b
commit 5f1b8c66deb4f825bc626a2cc8bf1251841bf9ac
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu May 18 07:48:13 2017 +0200

View File

@ -1,4 +1,4 @@
commit 58b86ea0cba77004b59a87b6e1de253d93fde3c9
commit 3f96689198c891694184f8f7d2570b1fcb8df438
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
Date: Mon Oct 15 09:33:09 2018 +0200

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ede5f897b5a772ef35faa49a94517059510764b3d50df52b267555e17c0c6594
size 4190692

3
mstflint-4.11.0-5.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0df3ddb6652f1f42b913aabe99e998c74c6f0416909529f735872918996d2e67
size 4573487

View File

@ -1,3 +1,47 @@
-------------------------------------------------------------------
Thu Sep 5 14:30:48 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
- Update to v4.11.0-5 (bsc#1136328)
- Build related changes
- Disabled -Werror compiler flag
- Added the option to choose local system libraries if available in the machine
- Enhanced python 3 compatibility
- Removed python shebangs from the scripts
- Fixed multiple rpmbuild issues
- Added --enable-all-static configure flag that allows compilation of static executables, when the the option is supported by the compiler
- All python scripts were aligned to unix encoding
- Fixed multiple builds and compilation issues
- mstprivhost tool
- Added mstprivhost tool to set host privilege configurations
- mstflint tool
- Added missing Rom info attribute for legacy FW qq query
- Fixed query timeout when device is locked
- Renamed former --next_boot_fw_ver to --flashed_version flag. This flag queries the flashed version.
- Note that the previous flag is supported to keep compatibility.
- Fixed an issue with FW upgrade on ConnectX-5 EN
- mstregdup tool
- Fixed segfault
- mstconfig
- Added new params:
- mstfwtrace
- Added fwtracer: in this release, this tool supports secure FW flow only
- libibmad
- Added support for libibmad 12 in addition to 5
- Python tools
- Fixed Python wrapper to work properly in multiple OSes and multiple Python versions
- Added adb generic tools
- Added mstreg tool: To enable this option please use "--enable-adb-genaric-tools" flag
- mstarchive
- Added return values
- Fixed an issue in the MFA2's header minor and subminor versions
- Drop patches that were fixed upstream:
- Add-armv6-and-armv7-support.patch
- Add-s390-s390x-support.patch
- Refresh patchest against latest sources:
- Fix-gcc7-and-gcc8.patch
- Remove-date-time-info-from-build.patch
- fix-race-condition-during-install.patch
-------------------------------------------------------------------
Fri Mar 29 07:54:57 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>

View File

@ -16,7 +16,7 @@
#
%define extra_version -3
%define extra_version -5
Name: mstflint
Version: 4.11.0
@ -28,8 +28,6 @@ Url: http://www.openfabrics.org
Obsoletes: mstflint-devel < %{version}
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
BuildRequires: gcc-c++
@ -52,8 +50,6 @@ the downloads page at the Mellanox web site.
%prep
%setup -q
%patch1
%patch2
%patch3
%patch4
%patch5
@ -83,6 +79,7 @@ rm -rf %{buildroot}%{_bindir}/hca_self_test.ofed
%{_bindir}/mstprivhost
%{_bindir}/mstregdump
%{_bindir}/mstvpd
%{_bindir}/mstfwtrace
%{_mandir}/man1/*.1%{ext_man}
%{_libdir}/mstflint/
%{_datadir}/mstflint/