Rebase to latest upstream release 4.6.0
Update mstflint package from github. Resolves: bz1423970 Signed-off-by: Honggang Li <honli@redhat.com>
This commit is contained in:
parent
4816fc1d2e
commit
e06f38a02b
1
.gitignore
vendored
1
.gitignore
vendored
@ -20,3 +20,4 @@ noarch/
|
||||
/mstflint-4.1.0/
|
||||
/mstflint-4.3.0-1.49.g9b9af70.tar.gz
|
||||
/mstflint-4.4.0-1.12.gd1edd58.tar.gz
|
||||
/mstflint-4.6.0.tar.gz
|
||||
|
47
0001-Extend-buffer-for-a-few-arrays.patch
Normal file
47
0001-Extend-buffer-for-a-few-arrays.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From b947fc631d499fa6e041b6c460320bcd253f4671 Mon Sep 17 00:00:00 2001
|
||||
From: Honggang Li <honli@redhat.com>
|
||||
Date: Wed, 22 Feb 2017 01:42:25 -0500
|
||||
Subject: [PATCH] Extend buffer for a few arrays
|
||||
|
||||
Signed-off-by: Honggang Li <honli@redhat.com>
|
||||
---
|
||||
mtcr_ul/mtcr_ul_com.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/mtcr_ul/mtcr_ul_com.c b/mtcr_ul/mtcr_ul_com.c
|
||||
index 50a663f..1335b43 100644
|
||||
--- a/mtcr_ul/mtcr_ul_com.c
|
||||
+++ b/mtcr_ul/mtcr_ul_com.c
|
||||
@@ -1353,7 +1353,7 @@ int mdevices_v_ul(char *buf, int len, int mask, int verbosity)
|
||||
}
|
||||
|
||||
char inbuf[64];
|
||||
- char fname[64];
|
||||
+ char fname[300];
|
||||
|
||||
d = opendir("/sys/bus/pci/devices");
|
||||
if (d == NULL) {
|
||||
@@ -1369,7 +1369,7 @@ int mdevices_v_ul(char *buf, int len, int mask, int verbosity)
|
||||
continue;
|
||||
} else if (sz > 4 && strcmp(dir->d_name + sz - 4, "00.0") && !verbosity) {
|
||||
// Skip virtual functions
|
||||
- char physfn[64];
|
||||
+ char physfn[300];
|
||||
DIR* physfndir;
|
||||
sprintf(physfn, "/sys/bus/pci/devices/%s/physfn", dir->d_name);
|
||||
if ((physfndir = opendir(physfn)) != NULL) {
|
||||
@@ -1993,9 +1993,9 @@ int mclose_ul(mfile *mf)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#define IBDR_MAX_NAME_SIZE 128
|
||||
+#define IBDR_MAX_NAME_SIZE 300
|
||||
#define BDF_NAME_SIZE 12
|
||||
-#define DEV_DIR_MAX_SIZE 128
|
||||
+#define DEV_DIR_MAX_SIZE 300
|
||||
static
|
||||
int get_inband_dev_from_pci(char* inband_dev, char* pci_dev)
|
||||
{
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1,11 +1,12 @@
|
||||
Name: mstflint
|
||||
Summary: Mellanox firmware burning tool
|
||||
Version: 4.4.0
|
||||
Release: 2.12.gd1edd58.1%{?dist}
|
||||
Version: 4.6.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ or BSD
|
||||
Group: Applications/System
|
||||
Source: https://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-1.12.gd1edd58.tar.gz
|
||||
Url: https://www.openfabrics.org
|
||||
Source: https://github.com/Mellanox/%{name}/releases/download/v4.6.0-1/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-Extend-buffer-for-a-few-arrays.patch
|
||||
Url: https://github.com/Mellanox/mstflint
|
||||
BuildRequires: libstdc++-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: libibmad-devel >= 1.3.12
|
||||
@ -18,12 +19,13 @@ It also provides access to the relevant source code.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1
|
||||
find . -type f -iname '*.[ch]' -exec chmod a-x '{}' ';'
|
||||
find . -type f -iname '*.cpp' -exec chmod a-x '{}' ';'
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -Wno-c++11-compat"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -Wno-implicit-fallthrough"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98 -Wno-c++11-compat -Wno-implicit-fallthrough"
|
||||
%configure
|
||||
make
|
||||
|
||||
@ -39,6 +41,11 @@ rm -fr %{buildroot}%{_libdir}
|
||||
%_bindir/*
|
||||
|
||||
%changelog
|
||||
* Wed Feb 22 2017 Honggang Li <honli@redhat.com> - 4.6.0-1
|
||||
- Rebase to latest upstream release 4.6.0.
|
||||
- Update mstflint package from github.
|
||||
- Resolves: bz1423970
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0-2.12.gd1edd58.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user