From 0e74ab7ffe4781472bfda6164330bd729b0316312fa983b0a7eb801d47a3accd Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 10 Aug 2017 08:38:48 +0000 Subject: [PATCH] Accepting request 515853 from home:NMoreyChaisemartin:branches:science:HPC - Update to v4.7.0-1, No info of changes available OBS-URL: https://build.opensuse.org/request/show/515853 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mstflint?expand=0&rev=15 --- mstflint-4.6.0.tar.gz | 3 --- mstflint-4.7.0.tar.gz | 3 +++ mstflint-armv7_arch.patch | 20 ++++++++++---------- mstflint-gcc7.patch | 16 ++++++++++++++-- mstflint-s390_arch.patch | 32 ++++++++++++++++---------------- mstflint.changes | 5 +++++ mstflint.spec | 2 +- 7 files changed, 49 insertions(+), 32 deletions(-) delete mode 100644 mstflint-4.6.0.tar.gz create mode 100644 mstflint-4.7.0.tar.gz diff --git a/mstflint-4.6.0.tar.gz b/mstflint-4.6.0.tar.gz deleted file mode 100644 index 628016c..0000000 --- a/mstflint-4.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2111c353a97d0c2b4f33aeef51daa80b750db32394f6e2174a3751bd5f962352 -size 3839365 diff --git a/mstflint-4.7.0.tar.gz b/mstflint-4.7.0.tar.gz new file mode 100644 index 0000000..19ceb61 --- /dev/null +++ b/mstflint-4.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6d1f1c38ef44eda354870a0165b6fd9ae99354cf5ecf13454574d2776cc0420 +size 3543376 diff --git a/mstflint-armv7_arch.patch b/mstflint-armv7_arch.patch index fb2880d..9d4c9dc 100644 --- a/mstflint-armv7_arch.patch +++ b/mstflint-armv7_arch.patch @@ -1,5 +1,5 @@ diff --git common/compatibility.h common/compatibility.h -index 7c42fa7..46cd928 100644 +index c034df3..c17eae9 100644 --- common/compatibility.h +++ common/compatibility.h @@ -59,6 +59,8 @@ @@ -10,18 +10,18 @@ index 7c42fa7..46cd928 100644 +# define ARCH_armv7 # elif defined(__aarch64__) # define ARCH_arm64 - # elif defined(__s390x__) -@@ -96,7 +98,7 @@ + # 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_s390) -+#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) +-#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(__MINGW32__) || defined(__MINGW64__) # include # define U64D_FMT "0x%" PRId64 diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h -index 0963ba7..618a2f9 100644 +index 5728fc7..213f227 100644 --- mtcr_ul/packets_common.h +++ mtcr_ul/packets_common.h @@ -148,6 +148,8 @@ @@ -32,13 +32,13 @@ index 0963ba7..618a2f9 100644 +# define ARCH_armv7 # elif defined(__aarch64__) # define ARCH_arm64 - # elif defined(__s390x__) -@@ -177,7 +179,7 @@ + # 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_s390) -+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_s390) || defined(__ARM_ARCH_7A__) +-#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" diff --git a/mstflint-gcc7.patch b/mstflint-gcc7.patch index 3effe8c..889ed40 100644 --- a/mstflint-gcc7.patch +++ b/mstflint-gcc7.patch @@ -1,8 +1,8 @@ diff --git configure.ac configure.ac -index f988818..8384528 100644 +index bc966cd..6265f28 100644 --- configure.ac +++ configure.ac -@@ -98,6 +98,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [ +@@ -121,6 +121,7 @@ AS_IF([test "x$enable_dynamic_ld" = "xyes"], [ LDFLAGS="$LDFLAGS -Wl,--dynamic-linker=/lib64/ld64.so.2" ]) @@ -10,3 +10,15 @@ index f988818..8384528 100644 CFLAGS="$CFLAGS -Werror -DMST_UL" CXXFLAGS="$CXXFLAGS -Werror -DMST_UL" +diff --git fw_comps_mgr/fw_comps_mgr.cpp fw_comps_mgr/fw_comps_mgr.cpp +index f4afc0c..ec6dad0 100644 +--- fw_comps_mgr/fw_comps_mgr.cpp ++++ fw_comps_mgr/fw_comps_mgr.cpp +@@ -804,7 +804,6 @@ void FwCompsMgr::extractRomInfo(tools_open_mgir* mgir, fwInfoT* fwQuery) + bool FwCompsMgr::queryFwInfo(fwInfoT* query) + { + if (!query) { +- return FWCOMPS_BAD_PARAM; + return false; + } + memset(query, 0, sizeof(fwInfoT)); diff --git a/mstflint-s390_arch.patch b/mstflint-s390_arch.patch index 4b15a22..043b026 100644 --- a/mstflint-s390_arch.patch +++ b/mstflint-s390_arch.patch @@ -1,11 +1,11 @@ diff --git common/compatibility.h common/compatibility.h -index e202b42..7c42fa7 100644 +index ea320d9..c034df3 100644 --- common/compatibility.h +++ common/compatibility.h -@@ -61,6 +61,10 @@ - # define ARCH_ppc - # elif defined(__aarch64__) +@@ -63,6 +63,10 @@ # define ARCH_arm64 + # elif defined(__arm__) + # define ARCH_arm6l +# elif defined(__s390x__) +# define ARCH_s390x +# elif defined(__s390__) @@ -13,16 +13,16 @@ index e202b42..7c42fa7 100644 # else # error Unknown CPU architecture using the linux OS # endif -@@ -92,7 +96,7 @@ +@@ -94,7 +98,7 @@ #define U16H_FMT "0x%04x" #define U8H_FMT "0x%02x" --#if defined(ARCH_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) -+#if 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 # define U64D_FMT "0x%" PRId64 -@@ -107,7 +111,7 @@ +@@ -109,7 +113,7 @@ # define U48H_FMT "0x%012llx" # define U64D_FMT_GEN "llu" # endif @@ -32,13 +32,13 @@ index e202b42..7c42fa7 100644 # define U64H_FMT "0x%016lx" # define U48H_FMT "0x%012lx" diff --git mtcr_ul/packets_common.h mtcr_ul/packets_common.h -index dd02b71..0963ba7 100644 +index 453c26f..5728fc7 100644 --- mtcr_ul/packets_common.h +++ mtcr_ul/packets_common.h -@@ -150,6 +150,10 @@ - # define ARCH_ppc - # elif defined(__aarch64__) +@@ -152,6 +152,10 @@ # define ARCH_arm64 + # elif defined(__arm__) + # define ARCH_arm6l +# elif defined(__s390x__) +# define ARCH_s390x +# elif defined(__s390__) @@ -46,7 +46,7 @@ index dd02b71..0963ba7 100644 # else # error Unknown CPU architecture using the linux OS # endif -@@ -163,9 +167,9 @@ +@@ -164,9 +168,9 @@ /**********************************/ /* define macros for print fields */ @@ -58,12 +58,12 @@ index dd02b71..0963ba7 100644 # define U64H_FMT "0x%016lx" # define U64D_FMT "%lu" # define U32H_FMT "0x%08x" -@@ -173,7 +177,7 @@ +@@ -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) -+#elif defined(ARCH_x86) || defined(ARCH_ppc) || defined(__MINGW32__) || defined(UEFI_BUILD) || defined(ARCH_s390) +-#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 a/mstflint.changes b/mstflint.changes index 1673faa..91e91e6 100644 --- a/mstflint.changes +++ b/mstflint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 9 15:36:35 UTC 2017 - nmoreychaisemartin@suse.com + +- Update to v4.7.0-1, No info of changes available + ------------------------------------------------------------------- Fri Jun 23 15:40:51 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/mstflint.spec b/mstflint.spec index f5f1ca7..45733b7 100644 --- a/mstflint.spec +++ b/mstflint.spec @@ -19,7 +19,7 @@ %define extra_version -1 Name: mstflint -Version: 4.6.0 +Version: 4.7.0 Release: 0 Summary: Mellanox Firmware Burning and Diagnostics Tools License: GPL-2.0 or BSD-2-Clause