Accepting request 244011 from OFED:Factory

Fix all issues

OBS-URL: https://build.opensuse.org/request/show/244011
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mstflint?expand=0&rev=1
This commit is contained in:
Ludwig Nussel 2014-08-11 08:07:23 +00:00 committed by Git OBS Bridge
commit 5ea073883f
9 changed files with 487 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

View File

@ -0,0 +1,42 @@
---
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

View File

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

63
mstflint-autotools.patch Normal file
View File

@ -0,0 +1,63 @@
---
configure.ac | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2014-05-14 04:09:28.079178181 +0200
+++ configure.ac 2014-05-14 04:13:35.515332301 +0200
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(mstflint, 3.6.0, orenk@mellanox.co.il)
+AC_INIT([mstflint], [3.6.0], [orenk@mellanox.co.il])
AC_DEFINE_UNQUOTED([PROJECT], ["mstflint"], [Define the project name.])
AC_SUBST([PROJECT])
@@ -10,13 +10,13 @@ AC_SUBST([VERSION])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_SRCDIR([README])
-AM_INIT_AUTOMAKE(mstflint, 3.6.0)
+AM_INIT_AUTOMAKE([-Wall foreign])
dnl Checks for programs
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_LIBTOOL
-AC_CONFIG_HEADERS( config.h )
+AC_PROG_CC()
+AC_PROG_CXX()
+AC_PROG_LIBTOOL()
+AC_CONFIG_HEADERS([config.h])
AC_MSG_CHECKING(--enable-dc argument)
AC_ARG_ENABLE(dc,
@@ -47,9 +47,23 @@ AM_CONDITIONAL(ENABLE_INBAND, [test "x$
CFLAGS="$CFLAGS -Werror -DMST_UL"
CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
-AC_CONFIG_FILES( mstflint.spec )
+AC_CONFIG_FILES( mstflint.spec \
+ Makefile \
+ mft_utils/Makefile \
+ mtcr_ul/Makefile \
+ dev_mgt/Makefile \
+ tools_layouts/Makefile \
+ reg_access/Makefile \
+ mlxconfig/Makefile \
+ mflash/Makefile \
+ mlxfwops/Makefile \
+ mlxfwops/lib/Makefile \
+ cmdparser/Makefile flint/Makefile \
+ small_utils/Makefile \
+ mstdump/Makefile \
+ mstdump/crd_lib/Makefile \
+ mstdump/crd_main/Makefile \
+ mstdump/mstdump_dbs/Makefile )
-AC_OUTPUT( Makefile mft_utils/Makefile mtcr_ul/Makefile dev_mgt/Makefile tools_layouts/Makefile reg_access/Makefile mlxconfig/Makefile \
- mflash/Makefile mlxfwops/Makefile mlxfwops/lib/Makefile cmdparser/Makefile flint/Makefile \
- small_utils/Makefile mstdump/Makefile mstdump/crd_lib/Makefile mstdump/crd_main/Makefile mstdump/mstdump_dbs/Makefile )
+AC_OUTPUT()

23
mstflint-no_Werror.patch Normal file
View File

@ -0,0 +1,23 @@
From: Philipp Thomas <pth@suse.de>
Date: 2014-05-16 13:49:13+02:00
Subject: Do not use Werror
References:
Upstream:
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: configure.ac
===================================================================
--- configure.ac.orig 2014-05-16 13:47:48.973039815 +0200
+++ configure.ac 2014-05-16 13:48:26.381156099 +0200
@@ -45,7 +45,7 @@ fi
AM_CONDITIONAL(ENABLE_INBAND, [test "x$enable_inband" = "xyes"])
CFLAGS="$CFLAGS -Werror -DMST_UL"
-CXXFLAGS="$CXXFLAGS -Werror -DMST_UL"
+CXXFLAGS="$CXXFLAGS -DMST_UL"
AC_CONFIG_FILES( mstflint.spec \
Makefile \

112
mstflint-s390_arch.patch Normal file
View File

@ -0,0 +1,112 @@
From: Philipp Thomas <pth@suse.de>
Date: 2014-03-03 16:52:28+01:00
Subject: Add defines for s390x
---
common/compatibility.h | 8 ++++++--
mtcr_ul/packets_common.h | 10 +++++++---
tools_layouts/adb_to_c_utils.h | 8 ++++++--
3 files changed, 19 insertions(+), 7 deletions(-)
Index: common/compatibility.h
===================================================================
--- common/compatibility.h.orig 2014-04-10 15:37:31.000000000 +0200
+++ common/compatibility.h 2014-05-16 13:32:41.440750201 +0200
@@ -61,6 +61,10 @@
# define ARCH_ppc
# elif defined(__aarch64__)
# define ARCH_arm64
+# elif defined(__s390__)
+# define ARCH_s390
+# elif defined(__s390x__)
+# define ARCH_s390x
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -92,7 +96,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(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
# define U64D_FMT "0x%"PRId64
@@ -107,7 +111,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"
Index: mtcr_ul/packets_common.h
===================================================================
--- mtcr_ul/packets_common.h.orig 2014-04-10 15:37:32.000000000 +0200
+++ mtcr_ul/packets_common.h 2014-05-16 13:41:15.870778141 +0200
@@ -148,6 +148,10 @@
# define ARCH_ppc
# elif defined(__aarch64__)
# define ARCH_arm64
+# elif defined(__s390__)
+# define ARCH_s390
+# elif defined(__s390x__)
+# define ARCH_s390x
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -161,9 +165,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"
@@ -171,7 +175,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)
# define U64H_FMT "0x%016llx"
# define U64D_FMT "%llu"
# define U32H_FMT "0x%08x"
Index: tools_layouts/adb_to_c_utils.h
===================================================================
--- tools_layouts/adb_to_c_utils.h.orig 2014-04-10 15:37:32.000000000 +0200
+++ tools_layouts/adb_to_c_utils.h 2014-05-16 13:29:37.380740505 +0200
@@ -133,6 +133,10 @@ extern "C" {
# define ARCH_ppc
# elif defined(__aarch64__)
# define ARCH_arm64
+# elif defined(__s390__)
+# define ARCH_s390
+# elif defined(__s390x__)
+# define ARCH_s390x
# else
# error Unknown CPU architecture using the linux OS
# endif
@@ -165,7 +169,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_x86) || defined(ARCH_ppc) || defined(UEFI_BUILD) || defined(ARCH_s390)
# if defined(__MINGW32__) || defined(__MINGW64__)
# include <inttypes.h>
# define U64D_FMT "0x%"PRId64
@@ -176,7 +180,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"

136
mstflint.changes Normal file
View File

@ -0,0 +1,136 @@
-------------------------------------------------------------------
Fri Aug 8 19:27:26 CEST 2014 - pth@suse.de
- Rename mstfint-mtcr_ul_no_static_lib to mstfint-mtcr_ul_no_static_lib.patch
and include the patch for building and using a dynamic library
as a source.
-------------------------------------------------------------------
Thu Jul 24 16:42:27 CEST 2014 - pth@suse.de
- Don't install header and library and thus the devel package can
be removed.
-------------------------------------------------------------------
Tue Jun 3 11:24:34 CEST 2014 - pth@suse.de
- Update to OFED 3.12 final.
-------------------------------------------------------------------
Fri May 16 13:50:49 CEST 2014 - pth@suse.de
- Fix mstflint-s390_arch.patch to cover all new cases where
architecture is checked.
- Add mstflint-no_Werror.patch because currently there are
warnings where printf formats don't match passed vars.
-------------------------------------------------------------------
Wed May 14 04:19:49 CEST 2014 - pth@suse.de
- Update to 3.6.0 from OFED 3.12 RC2.
- Remove patches as the code was fixed upstream:
mstflint-fix_type-punning.patch
aarch64-arch-detection.diff
- Adapt mstflint-s390_arch.patch to the new code.
- Remove mstflint-shared_lib.patch as it causes more work with
few gains.
-------------------------------------------------------------------
Tue Apr 22 16:22:50 CEST 2014 - pth@suse.de
- Add all defines needed for s390.
-------------------------------------------------------------------
Tue Mar 4 12:52:48 CET 2014 - pth@suse.de
- Fix mstflint-s390_arch.patch so that it applies.
-------------------------------------------------------------------
Mon Mar 3 17:25:46 CET 2014 - pth@suse.de
- Add all necessary defines or s390x (mstflint-s390_arch.patch).
-------------------------------------------------------------------
Mon Feb 10 20:35:40 UTC 2014 - dmueller@suse.com
- add aarch64-arch-detection.diff: Fix aarch64 detection
-------------------------------------------------------------------
Mon Feb 3 13:23:02 CET 2014 - pth@suse.de
- Update to latest 3.5.0. No change log in package.
- Specify full source URL.
- Use spdx.org format for license specification
- Add mstflint-autotools.patch that modifies configure.ac so
that autoreconf can run successfully.
- Remove configure.in as configure.ac is present.
- Create devel subpackage.
- Add mstflint-fix_type-punning.patch that fixes all cases of
type-punning by using memcpy.
- Add COPYING and LICENSE to documentation.
-------------------------------------------------------------------
Fri Dec 7 19:19:48 CET 2012 - pth@suse.de
- Update to from OFED 1.5.4.1 (fate#314255)
- Remove patches that were integrated:
mstflint-includefix.patch
mstflint-1.4-0.6.g63179f4-connectX3.diff
-------------------------------------------------------------------
Tue Jan 10 10:21:38 UTC 2012 - stefan.fent@suse.com
- Add Connect X3 support (bnc #732326)
-------------------------------------------------------------------
Thu Oct 28 16:37:49 UTC 2010 - jjolly@novell.com
- Update to v1.4--0.6.g63179f4 from OFED 1.5.2
- Refreshed include error patch
-------------------------------------------------------------------
Thu Dec 11 22:52:53 CET 2008 - jjolly@suse.de
- Updated to package from OFED 1.4 GA
- Added hca_self_test.ofed installation
-------------------------------------------------------------------
Tue Oct 28 08:23:16 CET 2008 - jjolly@suse.de
- Updated to v1.4 from OFED 1.3 rc3
-------------------------------------------------------------------
Mon Oct 27 23:07:12 CET 2008 - ro@suse.de
- fix build
-------------------------------------------------------------------
Fri Sep 12 08:37:19 CEST 2008 - jjolly@suse.de
- Updated to v1.3 from OFED 1.4 RC1
-------------------------------------------------------------------
Tue Aug 7 12:16:05 CEST 2007 - hvogel@suse.de
- Update to version from OFED 1.2c
-------------------------------------------------------------------
Thu Jul 12 14:39:12 CEST 2007 - hvogel@suse.de
- package include/mtcr.h
-------------------------------------------------------------------
Wed Jul 4 12:04:03 CEST 2007 - hvogel@suse.de
- Add GPL COPYING file [#288876]
-------------------------------------------------------------------
Tue Jul 3 13:33:43 CEST 2007 - hvogel@suse.de
- Use correct git checkout from OFED 1.2
-------------------------------------------------------------------
Wed Jun 20 17:40:25 CEST 2007 - hvogel@suse.de
- Initial Package, Version 1.2

84
mstflint.spec Normal file
View File

@ -0,0 +1,84 @@
#
# spec file for package mstflint
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define extra_version -1.8.g7d4dede
Name: mstflint
Summary: Mellanox Firmware Burning and Diagnostics Tools
License: GPL-2.0 or BSD-2-Clause
Group: System/Console
Version: 3.6.0
Release: 0
Source0: %{name}-%{version}%{extra_version}.tar.gz
# PATCH-FIX-UPSTREAM Declare package as foreign and other autotools stuff pth@suse.de
Patch0: mstflint-autotools.patch
# PATCH-FIX-UPSTREAM Add all needed defines to get it built on s390x
Patch4: mstflint-s390_arch.patch
# PATCH-FIX-UPSTREAM Don't use -Werror as there are format warnings
Patch5: mstflint-no_Werror.patch
# PATCH-FIX-UPSTREAM Build libmtcr as shared library
Source1: mstfint-mtcr_ul_no_static_lib.patch
Url: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libibmad-devel
BuildRequires: libtool
BuildRequires: zlib-devel
#%%define DT_FLAGS %%{?__commit_date:-D__DATE__=%%__commit_date}' '%%{?__commit_time:-D__TIME__=%%__commit_time}'
%description
This package contains a burning tool and diagnostic tools for Mellanox
manufactured HCA/NIC cards. It also provides access to the relevant
source code. Please see the file LICENSE for licensing details.
This package is based on a subset of the Mellanox Firmware Tools (MFT)
package. For a full documentation of the MFT package, please refer to
the downloads page at the Mellanox web site.
%prep
%setup -q
%patch0
%patch4
%patch5
rm -f configure.in
rm -f mtcr_ul/Makefile.in
%build
autoreconf -fi
%{configure}
make CFLAGS="%{optflags} -I. -fno-exceptions"
%install
make DESTDIR=%{buildroot} install
rm -ff %{buildroot}%{_includedir}/mtcr_ul/mtcr.h
rm -f %{buildroot}%{_libdir}/libmtcr_ul.a
#%%post -p /sbin/ldconfig
#%%postun -p /sbin/ldconfig
%files
%defattr(-, root, root)
%doc README COPYING LICENSE
%{_mandir}/man1/*.1.gz
%_bindir/*
%{_datadir}/%{name}
%changelog