rpm/mstflint
SHA256
1
0
Fork 0
forked from pool/mstflint
Code Pull Requests Activity

Accepting request 618884 from science:HPC

Browse Source 
- Update patches to fit science:HPC worflow
  - Remove old format patches
    - mstflint-4.4.0-implicit-declaration.patch
    - mstflint-4.4.0-no-date-time.patch
    - mstflint-armv6_arch.patch
    - mstflint-armv7_arch.patch
    - mstflint-gcc7.patch
    - mstflint-s390_arch.patch
  - Replaced with new format patches
    - Remove-date-time-info-from-build.patch
    - Add-s390-s390x-support.patch
    - Add-armv6-and-armv7-support.patch
    - Fix-gcc7-and-gcc8.patch
      - Patch was updated to also fix Gcc8 compilation issues
  - Drop obsolete patch
    - mstfint-mtcr_ul_no_static_lib.patch
- Update to v4.9.0-3
  - No release notes available

OBS-URL: https://build.opensuse.org/request/show/618884
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2018-06-25 09:43:01 +00:00 committed by Git OBS Bridge
commit fa21215ab9
11 changed files with 106 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mstflint-armv7_arch.patch → Add-armv6-and-armv7-support.patch
View File

@ -1,5 +1,13 @@
commit 3178d1cabfcf49959ed196bc599aa13f0a21b3fe
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 diff --git common/compatibility.h common/compatibility.h
index c034df3..c17eae9 100644 index c034df383ebe..c17eae907d76 100644
--- common/compatibility.h --- common/compatibility.h
+++ common/compatibility.h +++ common/compatibility.h
@@ -59,6 +59,8 @@ @@ -59,6 +59,8 @@
@ -21,7 +29,7 @@ index c034df3..c17eae9 100644
# include <inttypes.h> # include <inttypes.h>
# define U64D_FMT "0x%" PRId64 # define U64D_FMT "0x%" PRId64
diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h
index 5728fc7..213f227 100644 index 5728fc7fdd6e..213f227d9123 100644
--- mtcr_ul/packets_common.h --- mtcr_ul/packets_common.h
+++ mtcr_ul/packets_common.h +++ mtcr_ul/packets_common.h
@@ -148,6 +148,8 @@ @@ -148,6 +148,8 @@
@ -43,24 +51,26 @@ index 5728fc7..213f227 100644
# define U64D_FMT "%llu" # define U64D_FMT "%llu"
# define U32H_FMT "0x%08x" # define U32H_FMT "0x%08x"
diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h
index 26adb09..f60d217 100644 index 26adb09bec01..0db09f24c62c 100644
--- tools_layouts/adb_to_c_utils.h --- tools_layouts/adb_to_c_utils.h
+++ tools_layouts/adb_to_c_utils.h +++ tools_layouts/adb_to_c_utils.h
@@ -137,6 +137,8 @@ extern "C" { @@ -137,6 +137,10 @@ extern "C" {
# define ARCH_ppc # define ARCH_ppc
# elif defined(__aarch64__) # elif defined(__aarch64__)
# define ARCH_arm64 # define ARCH_arm64
+# elif defined(__ARM_ARCH_7A__) +# elif defined(__ARM_ARCH_7A__)
+# define ARCH_armv7 +# define ARCH_armv7
+# elif defined(__arm__)
+# define ARCH_arm6l
# elif defined(__s390x__) # elif defined(__s390x__)
# define ARCH_s390x # define ARCH_s390x
# elif defined(__s390__) # elif defined(__s390__)
@@ -177,7 +179,7 @@ extern "C" { @@ -177,7 +181,7 @@ extern "C" {
# define U64D_FMT "%lu" # define U64D_FMT "%lu"
# define U64H_FMT "0x%016lx" # define U64H_FMT "0x%016lx"
# define U48H_FMT "0x%012lx" # 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)
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) +#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) || defined(__arm__)
# if defined(__MINGW32__) || defined(__MINGW64__) # if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h> # include <inttypes.h>
# define U64D_FMT "0x%" PRId64 # define U64D_FMT "0x%" PRId64

14
mstflint-s390_arch.patch → Add-s390-s390x-support.patch
View File

@ -1,5 +1,13 @@
commit 1566087c13fa7e9aab45c57f9cf83390e8c0afa6
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 diff --git common/compatibility.h common/compatibility.h
index ea320d9..c034df3 100644 index ea320d9ed1da..c034df383ebe 100644
--- common/compatibility.h --- common/compatibility.h
+++ common/compatibility.h +++ common/compatibility.h
@@ -63,6 +63,10 @@ @@ -63,6 +63,10 @@
@ -32,7 +40,7 @@ index ea320d9..c034df3 100644
# define U64H_FMT "0x%016lx" # define U64H_FMT "0x%016lx"
# define U48H_FMT "0x%012lx" # define U48H_FMT "0x%012lx"
diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h
index 453c26f..5728fc7 100644 index 453c26fa12f9..5728fc7fdd6e 100644
--- mtcr_ul/packets_common.h --- mtcr_ul/packets_common.h
+++ mtcr_ul/packets_common.h +++ mtcr_ul/packets_common.h
@@ -152,6 +152,10 @@ @@ -152,6 +152,10 @@
@ -68,7 +76,7 @@ index 453c26f..5728fc7 100644
# define U64D_FMT "%llu" # define U64D_FMT "%llu"
# define U32H_FMT "0x%08x" # define U32H_FMT "0x%08x"
diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h diff --git tools_layouts/adb_to_c_utils.h tools_layouts/adb_to_c_utils.h
index 6268b69..26adb09 100644 index 6268b69b2e87..26adb09bec01 100644
--- tools_layouts/adb_to_c_utils.h --- tools_layouts/adb_to_c_utils.h
+++ tools_layouts/adb_to_c_utils.h +++ tools_layouts/adb_to_c_utils.h
@@ -137,6 +137,10 @@ extern "C" { @@ -137,6 +137,10 @@ extern "C" {

39
Fix-gcc7-and-gcc8.patch Normal file
View File

@ -0,0 +1,39 @@
commit eff41e6dc73e6f38e50296d1579372f7527fb84b
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Wed Aug 9 17:31:57 2017 +0200
Fix gcc7 and gcc8
Fix compilation errors for GCC7 and GCC8
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
diff --git configure.ac configure.ac
index 1aa9d36d5356..ca08a19c8805 100644
--- configure.ac
+++ configure.ac
@@ -164,16 +164,21 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
])
CFLAGS="$CFLAGS -Werror -DMST_UL"
+CPPFLAGS="$CPPFLAGS -DMST_UL"
CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
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"], [], [])
-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++])
TOOLS_BUILD_TIME=`date +"%b %d %Y\, %H:%M:%S"`
AC_SUBST(TOOLS_BUILD_TIME)

10
mstflint-4.4.0-no-date-time.patch → Remove-date-time-info-from-build.patch
View File

@ -1,5 +1,13 @@
commit a660f8e5dbc67fefa1b09837d33d986eb1971ec0
Author: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
Date: Thu May 18 07:48:13 2017 +0200
Remove date/time info from build
Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin@suse.com>
diff --git common/tools_version.h common/tools_version.h diff --git common/tools_version.h common/tools_version.h
index e3a242f..0bbeecf 100644 index 7fdb366446ce..dd2f5fb8850d 100644
--- common/tools_version.h --- common/tools_version.h
+++ 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 @@ -70,10 +70,8 @@ int get_version_string(char* buf, int buf_size, const char* exe_name, const char

42
mstfint-mtcr_ul_no_static_lib.patch
View File

@ -1,42 +0,0 @@
---
configure.ac | 2 +-
mtcr_ul/Makefile.am | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2014-07-24 11:34:24.103802523 +0200
+++ configure.ac 2014-07-24 11:46:03.279061630 +0200
@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([-Wall foreign])
dnl Checks for programs
AC_PROG_CC()
AC_PROG_CXX()
-AC_PROG_LIBTOOL()
+LT_INIT([disable_static])
AC_CONFIG_HEADERS([config.h])
AC_MSG_CHECKING(--enable-dc argument)
Index: mtcr_ul/Makefile.am
===================================================================
--- mtcr_ul/Makefile.am.orig 2014-04-10 15:37:32.000000000 +0200
+++ mtcr_ul/Makefile.am 2014-07-24 11:44:06.767518224 +0200
@@ -33,13 +33,13 @@
# Makefile.am -- Process this file with automake to produce Makefile.in
INCLUDES = -I$(top_srcdir)/include/mtcr_ul -I$(top_srcdir)/common
-lib_LIBRARIES = libmtcr_ul.a
+lib_LTLIBRARIES = libmtcr_ul.la
-libmtcr_ul_a_SOURCES = mtcr_ul.c mtcr_ib.h mtcr_int_defs.h\
- mtcr_tools_cif.c mtcr_tools_cif.h\
- packets_common.c packets_common.h\
- packets_layout.c packets_layout.h
-libmtcr_ul_a_CFLAGS = -W -Wall -g -MP -MD -fPIC -DMTCR_API="" -DMST_UL
+libmtcr_la_SOURCES = mtcr_ul.c mtcr_ib.h mtcr_int_defs.h\
+ mtcr_tools_cif.c mtcr_tools_cif.h\
+ packets_common.c packets_common.h\
+ packets_layout.c packets_layout.h
+libmtcr_la_CFLAGS = -W -Wall -g -MP -MD -fPIC -DMTCR_API="" -DMST_UL
if ENABLE_INBAND
libmtcr_ul_a_SOURCES += mtcr_ib_ofed.c

34
mstflint-4.4.0-implicit-declaration.patch
View File

@ -1,34 +0,0 @@
diff --git mstdump/crd_main/mstdump.c mstdump/crd_main/mstdump.c
index 32e2c28..7c66c85 100755
--- mstdump/crd_main/mstdump.c
+++ mstdump/crd_main/mstdump.c
@@ -125,12 +125,6 @@ int main(int argc, char* argv[]) {
}
++i; // move past the device parameter
-#ifndef MST_UL
- if (mf->tp == MST_MLNXOS) {
- mset_cr_access(mf, 1);
- }
-#endif
-
if (i < argc && !strncmp(argv[i], CAUSE_FLAG, strlen(CAUSE_FLAG))) {
i++;
}
diff --git small_utils/mcra.c small_utils/mcra.c
index dd18b2c..d77e20a 100644
--- small_utils/mcra.c
+++ small_utils/mcra.c
@@ -271,11 +271,7 @@ int main(int argc, char *argv[])
perror("mopen");
return 1;
}
-#ifndef MST_UL
- if (mf->tp == MST_MLNXOS) {
- mset_cr_access(mf, 1);
- }
-#endif
+
if (i2c_slave)
mset_i2c_slave(mf, (u_int8_t)i2c_slave);

4
mstflint-4.9.0.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:aee5583c9083ef4c0f3b46ba38ce45a6e6f61c5985ea93a442138e9f3e5b79e0 oid sha256:d484f07c53f851cf39f9f9bf2f15e0a81a64cf53bdd666a5456729acebea0bc8
size 4032237 size 4049246

20
mstflint-armv6_arch.patch
View File

@ -1,20 +0,0 @@
--- tools_layouts/adb_to_c_utils.h 2018-03-25 13:00:40.447893600 +0200
+++ tools_layouts/adb_to_c_utils.h 2018-03-25 13:04:15.462427635 +0200
@@ -139,6 +139,8 @@ extern "C" {
# 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__)
@@ -179,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) || defined(__ARM_ARCH_7A__)
+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) || defined(__arm__)
# if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
# define U64D_FMT "0x%" PRId64

12
mstflint-gcc7.patch
View File

@ -1,12 +0,0 @@
diff --git configure.ac configure.ac
index 437db76..360a948 100644
--- configure.ac
+++ configure.ac
@@ -144,6 +144,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [
LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2"
])
+CPPFLAGS="$CPPFLAGS -Wno-implicit-fallthrough"
CFLAGS="$CFLAGS -Werror -DMST_UL"
CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"

22
mstflint.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Jun 18 06:31:30 UTC 2018 - nmoreychaisemartin@suse.com
- Update patches to fit science:HPC worflow
- Remove old format patches
- mstflint-4.4.0-implicit-declaration.patch
- mstflint-4.4.0-no-date-time.patch
- mstflint-armv6_arch.patch
- mstflint-armv7_arch.patch
- mstflint-gcc7.patch
- mstflint-s390_arch.patch
- Replaced with new format patches
- Remove-date-time-info-from-build.patch
- Add-s390-s390x-support.patch
- Add-armv6-and-armv7-support.patch
- Fix-gcc7-and-gcc8.patch
- Patch was updated to also fix Gcc8 compilation issues
- Drop obsolete patch
- mstfint-mtcr_ul_no_static_lib.patch
- Update to v4.9.0-3
- No release notes available
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 25 11:17:55 UTC 2018 - kasimir_@outlook.de Sun Mar 25 11:17:55 UTC 2018 - kasimir_@outlook.de

28
mstflint.spec
View File

@ -16,39 +16,27 @@
# #
%define extra_version -2 %define extra_version -3
Name: mstflint Name: mstflint
Version: 4.9.0 Version: 4.9.0
Release: 0 Release: 0
Summary: Mellanox Firmware Burning and Diagnostics Tools Summary: Mellanox Firmware Burning and Diagnostics Tools
License: GPL-2.0 or BSD-2-Clause License: GPL-2.0-only OR BSD-2-Clause
Group: System/Console Group: System/Console
Url: http://www.openfabrics.org Url: http://www.openfabrics.org
Obsoletes: mstflint-devel < %{version} Obsoletes: mstflint-devel < %{version}
Source: https://github.com/Mellanox/mstflint/releases/download/v%{version}-1/mstflint-%{version}.tar.gz Source: https://github.com/Mellanox/mstflint/releases/download/v%{version}%{extra_version}/mstflint-%{version}.tar.gz
# PATCH-FIX-UPSTREAM Build libmtcr as shared library Patch1: Remove-date-time-info-from-build.patch
Source1: mstfint-mtcr_ul_no_static_lib.patch Patch2: Add-s390-s390x-support.patch
# PATCH-FIX-UPSTREAM Add all needed defines to get it built on s390x Patch3: Add-armv6-and-armv7-support.patch
Patch1: mstflint-s390_arch.patch Patch4: Fix-gcc7-and-gcc8.patch
# PATCH-FIX-UPSTREAM implicit declaration of mset_cr_access
Patch2: mstflint-4.4.0-implicit-declaration.patch
# PATCH-FIX-UPSTREAM no __DATE__ and __TIME__ in codes
Patch3: mstflint-4.4.0-no-date-time.patch
# PATCH-FIX-UPSTREAM Add all needed defines to get it built on armv7
Patch4: mstflint-armv7_arch.patch
# PATCH-FIX-UPSTREAM Ignore fallthrough for GCC7 support
Patch5: mstflint-gcc7.patch
# PATCH-FIX-UPSTREAM Add all needed defines to get it built on armv6
Patch6: mstflint-armv6_arch.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: infiniband-diags-devel BuildRequires: infiniband-diags-devel
BuildRequires: libibverbs-devel BuildRequires: libibverbs-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#%%define DT_FLAGS %%{?__commit_date:-D__DATE__=%%__commit_date}' '%%{?__commit_time:-D__TIME__=%%__commit_time}'
%description %description
This package contains a burning tool and diagnostic tools for Mellanox This package contains a burning tool and diagnostic tools for Mellanox
@ -65,8 +53,6 @@ the downloads page at the Mellanox web site.
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4
%patch5
%patch6
%build %build
./autogen.sh ./autogen.sh