Hello community,
here is the log from the commit of package libipathverbs for openSUSE:Factory checked in at 2015-02-16 21:14:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libipathverbs (Old)
and /work/SRC/openSUSE:Factory/.libipathverbs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libipathverbs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libipathverbs/libipathverbs.changes 2014-07-17 06:58:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libipathverbs.new/libipathverbs.changes 2015-02-16 21:14:31.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Feb 9 23:21:24 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 1.3
+ * No changelog available
+- Use download Url as source
+- Add dracut build require; libpathverbs now uses it to be charged
+ as a module
+- Add Requires(post) and Requires(pre): dracut because of dracut module
+- Update libipathverbs-configure.patch
+
+-------------------------------------------------------------------
Old:
----
libipathverbs-1.2.1.tar.gz
New:
----
libipathverbs-1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libipathverbs.spec ++++++
--- /var/tmp/diff_new_pack.TM2zXz/_old 2015-02-16 21:14:32.000000000 +0100
+++ /var/tmp/diff_new_pack.TM2zXz/_new 2015-02-16 21:14:32.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package libipathverbs (Version 1.2)
+# spec file for package libipathverbs
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -15,13 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+%define dracutlibdir %{_libexecdir}/dracut
+
Name: libipathverbs
Summary: PathScale InfiniPath HCA Userspace Driver
-Version: 1.2.1
+Version: 1.3
Release: 0
License: GPL-2.0 or BSD-2-Clause
Group: Productivity/Networking/System
-Source0: %{name}-%{version}.tar.gz
+Source0: https://www.openfabrics.org/downloads/libipathverbs/%{name}-%{version}.tar.gz
Source1: GPLv2.txt
Patch0: libipathverbs-configure.patch
Patch1: libipthverbs-no_libversion.patch
@@ -29,6 +32,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libibverbs-devel
BuildRequires: automake autoconf libtool
+BuildRequires: dracut
+Requires(pre): dracut
+Requires(post): dracut
%define lname libipathverbs-rdmav2
@@ -51,9 +57,9 @@
%setup -q
mv COPYING LICENSES
cp %{S:1} COPYING
-mv configure.in configure.ac
-%patch0
+%patch0 -p1
%patch1
+mv configure.in configure.ac
%build
autoreconf -fi
@@ -71,6 +77,12 @@
%dir %_sysconfdir/libibverbs.d
%config %_sysconfdir/libibverbs.d/*
%_libdir/libipathverbs-rdmav2.so
-
+%config %{_sysconfdir}/modprobe.d/truescale.conf
+%{_sbindir}/truescale-serdes.cmds
+%define dracutdir %(rpm -ql dracut | grep dracut-functions$ | sed 's/dracut-functions//')
+%{dracutdir}modules.d/90qib/install
+%{dracutdir}modules.d/90qib/check
+%{dracutdir}modules.d/90qib/installkernel
+%{dracutdir}modules.d/90qib
%changelog
++++++ libipathverbs-1.2.1.tar.gz -> libipathverbs-1.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/AUTHORS new/libipathverbs-1.3/AUTHORS
--- old/libipathverbs-1.2.1/AUTHORS 2014-02-04 15:23:58.000000000 +0100
+++ new/libipathverbs-1.3/AUTHORS 2014-07-23 22:52:55.000000000 +0200
@@ -1 +1 @@
-QLogic Corp.
+Intel Corporation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/COPYING new/libipathverbs-1.3/COPYING
--- old/libipathverbs-1.2.1/COPYING 2014-02-04 15:23:58.000000000 +0100
+++ new/libipathverbs-1.3/COPYING 2014-07-23 22:52:55.000000000 +0200
@@ -1,3 +1,4 @@
+Copyright (c) 2013. Intel Corporation. All rights reserved.
Copyright (c) 2007. QLogic Corp. All rights reserved.
Copyright (c) 2005. PathScale, Inc. All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/Makefile.am new/libipathverbs-1.3/Makefile.am
--- old/libipathverbs-1.2.1/Makefile.am 2014-02-04 15:23:58.000000000 +0100
+++ new/libipathverbs-1.3/Makefile.am 2014-07-23 22:52:55.000000000 +0200
@@ -52,12 +52,28 @@
src_ipathverbs_la_SOURCES = $(IPATHVERBS_SOURCES)
src_ipathverbs_la_LDFLAGS = -avoid-version -module $(ipathverbs_version_script)
endif
+ipathverbsmodprobedir = $(sysconfdir)/modprobe.d
+ipathverbsmodprobe_DATA = truescale.conf
EXTRA_DIST = src/ipathverbs.h \
src/ipath-abi.h \
src/ipathverbs.map \
libipathverbs.spec.in \
- ipath.driver
+ ipath.driver \
+ truescale-serdes.cmds \
+ truescale.conf
+
+
+sbin_SCRIPTS = truescale-serdes.cmds
+if HAS_DRACUT
+EXTRA_DIST += dracut_check dracut_install dracut_kmod
+dracutdir = $(DESTDIR)$(shell rpm -ql dracut | grep dracut-functions$$ | sed 's/dracut-functions//')modules.d/90qib
+
+install-data-local: dracut_check dracut_install dracut_kmod
+ $(INSTALL) -D -m 755 dracut_check $(dracutdir)/check
+ $(INSTALL) -D -m 755 dracut_install $(dracutdir)/install
+ $(INSTALL) -D -m 755 dracut_kmod $(dracutdir)/installkernel
+endif
dist-hook: libipathverbs.spec
cp libipathverbs.spec $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/Makefile.in new/libipathverbs-1.3/Makefile.in
--- old/libipathverbs-1.2.1/Makefile.in 2014-02-07 20:47:56.000000000 +0100
+++ new/libipathverbs-1.3/Makefile.in 2014-07-23 23:20:14.000000000 +0200
@@ -51,6 +51,7 @@
# product whatsoever.
+
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
@@ -70,6 +71,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@HAS_DRACUT_TRUE@am__append_1 = dracut_check dracut_install dracut_kmod
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -109,7 +111,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(ipathverbslibdir)" \
- "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ipathverbsconfdir)"
+ "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" \
+ "$(DESTDIR)$(ipathverbsconfdir)" \
+ "$(DESTDIR)$(ipathverbsmodprobedir)"
LTLIBRARIES = $(ipathverbslib_LTLIBRARIES) $(lib_LTLIBRARIES)
src_ipathverbs_la_LIBADD =
am__src_ipathverbs_la_SOURCES_DIST = src/ipathverbs.c src/verbs.c
@@ -134,6 +138,7 @@
$(src_libipathverbs_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@am_src_libipathverbs_la_rpath = \
@HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE@ -rpath $(libdir)
+SCRIPTS = $(sbin_SCRIPTS)
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -150,7 +155,7 @@
SOURCES = $(src_ipathverbs_la_SOURCES) $(src_libipathverbs_la_SOURCES)
DIST_SOURCES = $(am__src_ipathverbs_la_SOURCES_DIST) \
$(am__src_libipathverbs_la_SOURCES_DIST)
-DATA = $(ipathverbsconf_DATA)
+DATA = $(ipathverbsconf_DATA) $(ipathverbsmodprobe_DATA)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -219,6 +224,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+RDMA_DIR = @RDMA_DIR@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
@@ -290,12 +296,13 @@
@HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@ipathverbslib_LTLIBRARIES = src/ipathverbs.la
@HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@src_ipathverbs_la_SOURCES = $(IPATHVERBS_SOURCES)
@HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE@src_ipathverbs_la_LDFLAGS = -avoid-version -module $(ipathverbs_version_script)
-EXTRA_DIST = src/ipathverbs.h \
- src/ipath-abi.h \
- src/ipathverbs.map \
- libipathverbs.spec.in \
- ipath.driver
-
+ipathverbsmodprobedir = $(sysconfdir)/modprobe.d
+ipathverbsmodprobe_DATA = truescale.conf
+EXTRA_DIST = src/ipathverbs.h src/ipath-abi.h src/ipathverbs.map \
+ libipathverbs.spec.in ipath.driver truescale-serdes.cmds \
+ truescale.conf $(am__append_1)
+sbin_SCRIPTS = truescale-serdes.cmds
+@HAS_DRACUT_TRUE@dracutdir = $(DESTDIR)$(shell rpm -ql dracut | grep dracut-functions$$ | sed 's/dracut-functions//')modules.d/90qib
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -423,6 +430,40 @@
$(src_ipathverbs_la_LINK) $(am_src_ipathverbs_la_rpath) $(src_ipathverbs_la_OBJECTS) $(src_ipathverbs_la_LIBADD) $(LIBS)
src/libipathverbs.la: $(src_libipathverbs_la_OBJECTS) $(src_libipathverbs_la_DEPENDENCIES) src/$(am__dirstamp)
$(src_libipathverbs_la_LINK) $(am_src_libipathverbs_la_rpath) $(src_libipathverbs_la_OBJECTS) $(src_libipathverbs_la_LIBADD) $(LIBS)
+install-sbinSCRIPTS: $(sbin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+ done | \
+ sed -e 'p;s,.*/,,;n' \
+ -e 'h;s|.*|.|' \
+ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+ if (++n[d] == $(am__install_max)) { \
+ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+ else { print "f", d "/" $$4, $$1 } } \
+ END { for (d in files) print "f", d, files[d] }' | \
+ while read type dir files; do \
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
+ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
+ } \
+ ; done
+
+uninstall-sbinSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(sbin_SCRIPTS)'; test -n "$(sbindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -497,6 +538,26 @@
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(ipathverbsconfdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(ipathverbsconfdir)" && rm -f $$files
+install-ipathverbsmodprobeDATA: $(ipathverbsmodprobe_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(ipathverbsmodprobedir)" || $(MKDIR_P) "$(DESTDIR)$(ipathverbsmodprobedir)"
+ @list='$(ipathverbsmodprobe_DATA)'; test -n "$(ipathverbsmodprobedir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(ipathverbsmodprobedir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(ipathverbsmodprobedir)" || exit $$?; \
+ done
+
+uninstall-ipathverbsmodprobeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(ipathverbsmodprobe_DATA)'; test -n "$(ipathverbsmodprobedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(ipathverbsmodprobedir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(ipathverbsmodprobedir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -645,7 +706,7 @@
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
@@ -702,9 +763,9 @@
exit 1; } >&2
check-am: all-am
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) config.h
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(ipathverbslibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(ipathverbsconfdir)"; do \
+ for dir in "$(DESTDIR)$(ipathverbslibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(ipathverbsconfdir)" "$(DESTDIR)$(ipathverbsmodprobedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -733,6 +794,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+@HAS_DRACUT_FALSE@install-data-local:
clean: clean-am
clean-am: clean-generic clean-ipathverbslibLTLIBRARIES \
@@ -757,14 +819,15 @@
info-am:
-install-data-am: install-ipathverbsconfDATA \
- install-ipathverbslibLTLIBRARIES
+install-data-am: install-data-local install-ipathverbsconfDATA \
+ install-ipathverbslibLTLIBRARIES \
+ install-ipathverbsmodprobeDATA
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-libLTLIBRARIES
+install-exec-am: install-libLTLIBRARIES install-sbinSCRIPTS
install-html: install-html-am
@@ -807,7 +870,9 @@
ps-am:
uninstall-am: uninstall-ipathverbsconfDATA \
- uninstall-ipathverbslibLTLIBRARIES uninstall-libLTLIBRARIES
+ uninstall-ipathverbslibLTLIBRARIES \
+ uninstall-ipathverbsmodprobeDATA uninstall-libLTLIBRARIES \
+ uninstall-sbinSCRIPTS
.MAKE: all install-am install-strip
@@ -819,18 +884,26 @@
distclean-generic distclean-hdr distclean-libtool \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
- install-data install-data-am install-dvi install-dvi-am \
- install-exec install-exec-am install-html install-html-am \
- install-info install-info-am install-ipathverbsconfDATA \
- install-ipathverbslibLTLIBRARIES install-libLTLIBRARIES \
+ install-data install-data-am install-data-local install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am \
+ install-ipathverbsconfDATA install-ipathverbslibLTLIBRARIES \
+ install-ipathverbsmodprobeDATA install-libLTLIBRARIES \
install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-ipathverbsconfDATA \
- uninstall-ipathverbslibLTLIBRARIES uninstall-libLTLIBRARIES
+ install-ps-am install-sbinSCRIPTS install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-ipathverbsconfDATA \
+ uninstall-ipathverbslibLTLIBRARIES \
+ uninstall-ipathverbsmodprobeDATA uninstall-libLTLIBRARIES \
+ uninstall-sbinSCRIPTS
+
+@HAS_DRACUT_TRUE@install-data-local: dracut_check dracut_install dracut_kmod
+@HAS_DRACUT_TRUE@ $(INSTALL) -D -m 755 dracut_check $(dracutdir)/check
+@HAS_DRACUT_TRUE@ $(INSTALL) -D -m 755 dracut_install $(dracutdir)/install
+@HAS_DRACUT_TRUE@ $(INSTALL) -D -m 755 dracut_kmod $(dracutdir)/installkernel
dist-hook: libipathverbs.spec
cp libipathverbs.spec $(distdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/README new/libipathverbs-1.3/README
--- old/libipathverbs-1.2.1/README 2014-02-04 15:23:58.000000000 +0100
+++ new/libipathverbs-1.3/README 2014-07-23 22:52:55.000000000 +0200
@@ -1,22 +1,22 @@
Introduction
============
-libipathverbs is a userspace driver for the QLogic InfiniBand HCAs.
+libipathverbs is a userspace driver for the Intel InfiniBand HCAs.
It works as a plug-in module for libibverbs that allows programs to use
-QLogic HCAs directly from userspace. See the libibverbs package for
+Intel HCAs directly from userspace. See the libibverbs package for
more information.
Using libipathverbs
===================
libipathverbs will be loaded and used automatically by programs linked
-with libibverbs. The ib_ipath kernel module must be loaded for QLogic
+with libibverbs. The ib_ipath kernel module must be loaded for Intel
HCA devices to be detected and used.
Supported Hardware
==================
-libipathverbs currently supports the following QLogic HCAs:
+libipathverbs currently supports the following Intel HCAs:
InfiniPath QLE7140 PCIe Adapter
InfiniPath QMI7140 PCIe Adapter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/configure new/libipathverbs-1.3/configure
--- old/libipathverbs-1.2.1/configure 2014-02-07 20:47:57.000000000 +0100
+++ new/libipathverbs-1.3/configure 2014-07-23 23:20:15.000000000 +0200
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for libipathverbs 1.2.1.
+# Generated by GNU Autoconf 2.63 for libipathverbs 1.3.
#
-# Report bugs to .
+# Report bugs to .
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -745,9 +745,9 @@
# Identity of this package.
PACKAGE_NAME='libipathverbs'
PACKAGE_TARNAME='libipathverbs'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='libipathverbs 1.2.1'
-PACKAGE_BUGREPORT='support@qlogic.com'
+PACKAGE_VERSION='1.3'
+PACKAGE_STRING='libipathverbs 1.3'
+PACKAGE_BUGREPORT='ibsupport@intel.com'
ac_unique_file="src/ipathverbs.h"
# Factoring default headers for most tests.
@@ -790,7 +790,10 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+HAS_DRACUT_FALSE
+HAS_DRACUT_TRUE
IPATHVERBS_VERSION_SCRIPT
+RDMA_DIR
IBV_DEVICE_LIBRARY_EXTENSION
HAVE_IBV_DEVICE_LIBRARY_EXTENSION_FALSE
HAVE_IBV_DEVICE_LIBRARY_EXTENSION_TRUE
@@ -1471,7 +1474,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libipathverbs 1.2.1 to adapt to many kinds of systems.
+\`configure' configures libipathverbs 1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1541,7 +1544,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libipathverbs 1.2.1:";;
+ short | recursive ) echo "Configuration of libipathverbs 1.3:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1582,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to .
+Report bugs to .
_ACEOF
ac_status=$?
fi
@@ -1642,7 +1645,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libipathverbs configure 1.2.1
+libipathverbs configure 1.3
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1656,7 +1659,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libipathverbs $as_me 1.2.1, which was
+It was created by libipathverbs $as_me 1.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2508,7 +2511,7 @@
# Define the identity of the package.
PACKAGE=libipathverbs
- VERSION=1.2.1
+ VERSION=1.3
cat >>confdefs.h <<_ACEOF
@@ -4372,13 +4375,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4375: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4378: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4378: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4381: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4381: output\"" >&5)
+ (eval echo "\"\$as_me:4384: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5584,7 +5587,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5587 "configure"' > conftest.$ac_ext
+ echo '#line 5590 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7437,11 +7440,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7440: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7443: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7444: \$? = $ac_status" >&5
+ echo "$as_me:7447: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7776,11 +7779,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7783: \$? = $ac_status" >&5
+ echo "$as_me:7786: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7881,11 +7884,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7884: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7887: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7888: \$? = $ac_status" >&5
+ echo "$as_me:7891: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -7936,11 +7939,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7939: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7942: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7943: \$? = $ac_status" >&5
+ echo "$as_me:7946: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10739,7 +10742,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10742 "configure"
+#line 10745 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10835,7 +10838,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10838 "configure"
+#line 10841 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12088,9 +12091,9 @@
{ $as_echo "$as_me:$LINENO: WARNING: infiniband/driver.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: infiniband/driver.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
-## --------------------------------- ##
-## Report this to support@qlogic.com ##
-## --------------------------------- ##
+## ---------------------------------- ##
+## Report this to ibsupport@intel.com ##
+## ---------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@@ -12407,9 +12410,9 @@
{ $as_echo "$as_me:$LINENO: WARNING: valgrind/memcheck.h: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: valgrind/memcheck.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
-## --------------------------------- ##
-## Report this to support@qlogic.com ##
-## --------------------------------- ##
+## ---------------------------------- ##
+## Report this to ibsupport@intel.com ##
+## ---------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
@@ -13028,6 +13031,14 @@
fi
+if test -z "$RDMA_DIR"; then
+ if test -d /etc/infiniband; then
+ RDMA_DIR=infiniband
+ fi
+ if test -d /etc/rdma; then
+ RDMA_DIR=rdma
+ fi
+fi
{ $as_echo "$as_me:$LINENO: checking whether ld accepts --version-script" >&5
$as_echo_n "checking whether ld accepts --version-script... " >&6; }
@@ -13036,13 +13047,23 @@
else
if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
IPATHVERBS_VERSION_SCRIPT='-Wl,--version-script=$(srcdir)/src/ipathverbs.map'
+ ac_cv_version_script=yes
else
IPATHVERBS_VERSION_SCRIPT=
+ ac_cv_version_script=no
fi
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_version_script" >&5
$as_echo "$ac_cv_version_script" >&6; }
+ if type rpm > /dev/null 2>&1 && (rpm -qa | grep -q dracut) ; then
+ HAS_DRACUT_TRUE=
+ HAS_DRACUT_FALSE='#'
+else
+ HAS_DRACUT_TRUE='#'
+ HAS_DRACUT_FALSE=
+fi
+
ac_config_files="$ac_config_files Makefile libipathverbs.spec"
@@ -13179,6 +13200,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAS_DRACUT_TRUE}" && test -z "${HAS_DRACUT_FALSE}"; then
+ { { $as_echo "$as_me:$LINENO: error: conditional \"HAS_DRACUT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+$as_echo "$as_me: error: conditional \"HAS_DRACUT\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
@@ -13501,7 +13529,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libipathverbs $as_me 1.2.1, which was
+This file was extended by libipathverbs $as_me 1.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13564,7 +13592,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-libipathverbs config.status 1.2.1
+libipathverbs config.status 1.3
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/configure.in new/libipathverbs-1.3/configure.in
--- old/libipathverbs-1.2.1/configure.in 2014-02-07 20:44:31.000000000 +0100
+++ new/libipathverbs-1.3/configure.in 2014-07-23 23:01:58.000000000 +0200
@@ -1,5 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
+dnl Copyright (c) 2013 Intel Corporation. All rights reserved.
dnl Copyright (c) 2007. Qlogic Corp. All rights reserved.
dnl Copyright (c) 2003, 2004, 2005. PathScale, Inc. All rights reserved.
dnl
@@ -36,11 +37,11 @@
dnl product whatsoever.
AC_PREREQ(2.57)
-AC_INIT(libipathverbs, 1.2.1, support@qlogic.com)
+AC_INIT(libipathverbs, 1.3, ibsupport@intel.com)
AC_CONFIG_SRCDIR([src/ipathverbs.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libipathverbs, 1.2.1)
+AM_INIT_AUTOMAKE(libipathverbs, 1.3)
AM_PROG_LIBTOOL
AC_ARG_WITH([valgrind],
@@ -92,14 +93,26 @@
AM_CONDITIONAL(HAVE_IBV_DEVICE_LIBRARY_EXTENSION,
test $IBV_DEVICE_LIBRARY_EXTENSION != IBV_DEVICE_LIBRARY_EXTENSION)
AC_SUBST(IBV_DEVICE_LIBRARY_EXTENSION)
-
+if test -z "$RDMA_DIR"; then
+ if test -d /etc/infiniband; then
+ RDMA_DIR=infiniband
+ fi
+ if test -d /etc/rdma; then
+ RDMA_DIR=rdma
+ fi
+fi
+AC_SUBST(RDMA_DIR)
AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
[if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then
IPATHVERBS_VERSION_SCRIPT='-Wl,--version-script=$(srcdir)/src/ipathverbs.map'
+ ac_cv_version_script=yes
else
IPATHVERBS_VERSION_SCRIPT=
+ ac_cv_version_script=no
fi])
AC_SUBST(IPATHVERBS_VERSION_SCRIPT)
+AM_CONDITIONAL(HAS_DRACUT,
+ type rpm > /dev/null 2>&1 && (rpm -qa | grep -q dracut) )
AC_CONFIG_FILES([Makefile libipathverbs.spec])
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/dracut_check new/libipathverbs-1.3/dracut_check
--- old/libipathverbs-1.2.1/dracut_check 1970-01-01 01:00:00.000000000 +0100
+++ new/libipathverbs-1.3/dracut_check 2014-07-23 22:52:55.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -n "$hostonly" ]; then
+ lspci -n 2>/dev/null | grep -q -i "1077\|1fc1"
+ exit $?
+fi
+
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/dracut_install new/libipathverbs-1.3/dracut_install
--- old/libipathverbs-1.2.1/dracut_install 1970-01-01 01:00:00.000000000 +0100
+++ new/libipathverbs-1.3/dracut_install 2014-07-23 22:52:55.000000000 +0200
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+inst /etc/modprobe.d/truescale.conf
+inst /usr/sbin/truescale-serdes.cmds
+
+# All files needed by truescale-serdes.cmds need to be present here
+inst /sbin/lspci
+inst /bin/grep
+inst /bin/sed
+inst /usr/bin/logger
+inst /usr/sbin/dmidecode
+inst /bin/readlink
+inst /bin/echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/dracut_kmod new/libipathverbs-1.3/dracut_kmod
--- old/libipathverbs-1.2.1/dracut_kmod 1970-01-01 01:00:00.000000000 +0100
+++ new/libipathverbs-1.3/dracut_kmod 2014-07-23 22:52:55.000000000 +0200
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+instmods ib_qib
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/libipathverbs.spec new/libipathverbs-1.3/libipathverbs.spec
--- old/libipathverbs-1.2.1/libipathverbs.spec 2014-02-07 20:51:38.000000000 +0100
+++ new/libipathverbs-1.3/libipathverbs.spec 2014-07-23 23:20:19.000000000 +0200
@@ -1,3 +1,4 @@
+# Copyright (c) 2013. Intel Corporation. All rights reserved.
# Copyright (c) 2007, 2008, 2009. QLogic Corp. All rights reserved.
# Copyright (c) 2003, 2004, 2005. PathScale, Inc. All rights reserved.
#
@@ -33,14 +34,15 @@
# combinations of this program with other software, or any other
# product whatsoever.
-%define ver 1.2.1
+%define ver 1.3
%define RELEASE 1
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define with_dracut %(if rpm -qa | grep -q dracut; then echo 1; else echo 0; fi)
Name: libipathverbs
Version: %ver
Release: %rel%{?dist}
-Summary: QLogic InfiniPath HCA Userspace Driver
+Summary: Intel InfiniPath HCA Userspace Driver
Group: System Environment/Libraries
License: GPLv2 or BSD
@@ -49,9 +51,12 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
+%if %{with_dracut}
+Requires: dracut
+%endif
%description
-libipathverbs provides a device-specific userspace driver for QLogic HCAs
+libipathverbs provides a device-specific userspace driver for Intel HCAs
for use with the libibverbs library.
%package devel
@@ -82,8 +87,17 @@
%files
%defattr(-,root,root)
%{_libdir}/libipathverbs*.so
+%{_sbindir}/truescale-serdes.cmds
%doc AUTHORS COPYING README
%config %{_sysconfdir}/libibverbs.d/ipath.driver
+%config %{_sysconfdir}/modprobe.d/truescale.conf
+%if %{with_dracut}
+%define dracutdir %(rpm -ql dracut | grep dracut-functions$ | sed 's/dracut-functions//')
+%{dracutdir}modules.d/90qib/install
+%{dracutdir}modules.d/90qib/check
+%{dracutdir}modules.d/90qib/installkernel
+%{dracutdir}modules.d/90qib
+%endif
%files devel
%defattr(-,root,root,-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/libipathverbs.spec.in new/libipathverbs-1.3/libipathverbs.spec.in
--- old/libipathverbs-1.2.1/libipathverbs.spec.in 2014-02-04 15:23:58.000000000 +0100
+++ new/libipathverbs-1.3/libipathverbs.spec.in 2014-07-23 22:52:55.000000000 +0200
@@ -1,3 +1,4 @@
+# Copyright (c) 2013. Intel Corporation. All rights reserved.
# Copyright (c) 2007, 2008, 2009. QLogic Corp. All rights reserved.
# Copyright (c) 2003, 2004, 2005. PathScale, Inc. All rights reserved.
#
@@ -36,11 +37,12 @@
%define ver @VERSION@
%define RELEASE 1
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
+%define with_dracut %(if rpm -qa | grep -q dracut; then echo 1; else echo 0; fi)
Name: libipathverbs
Version: %ver
Release: %rel%{?dist}
-Summary: QLogic InfiniPath HCA Userspace Driver
+Summary: Intel InfiniPath HCA Userspace Driver
Group: System Environment/Libraries
License: GPLv2 or BSD
@@ -49,9 +51,12 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libibverbs-devel >= 1.0-0.5.rc7
+%if %{with_dracut}
+Requires: dracut
+%endif
%description
-libipathverbs provides a device-specific userspace driver for QLogic HCAs
+libipathverbs provides a device-specific userspace driver for Intel HCAs
for use with the libibverbs library.
%package devel
@@ -82,8 +87,17 @@
%files
%defattr(-,root,root)
%{_libdir}/libipathverbs*.so
+%{_sbindir}/truescale-serdes.cmds
%doc AUTHORS COPYING README
%config %{_sysconfdir}/libibverbs.d/ipath.driver
+%config %{_sysconfdir}/modprobe.d/truescale.conf
+%if %{with_dracut}
+%define dracutdir %(rpm -ql dracut | grep dracut-functions$ | sed 's/dracut-functions//')
+%{dracutdir}modules.d/90qib/install
+%{dracutdir}modules.d/90qib/check
+%{dracutdir}modules.d/90qib/installkernel
+%{dracutdir}modules.d/90qib
+%endif
%files devel
%defattr(-,root,root,-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/truescale-serdes.cmds new/libipathverbs-1.3/truescale-serdes.cmds
--- old/libipathverbs-1.2.1/truescale-serdes.cmds 1970-01-01 01:00:00.000000000 +0100
+++ new/libipathverbs-1.3/truescale-serdes.cmds 2014-07-23 22:52:55.000000000 +0200
@@ -0,0 +1,257 @@
+#!/bin/sh
+# Copyright (c) 2013 Intel Corporation. All rights reserved.
+# Copyright (c) 2010 QLogic Corporation.
+# All rights reserved.
+#
+# This software is available to you under a choice of one of two
+# licenses. You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+# - Redistributions of source code must retain the above
+# copyright notice, this list of conditions and the following
+# disclaimer.
+#
+# - Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials
+# provided with the distribution.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# This script does truescale (qib) adapter-specific actions, and is
+# sourced during boot after the ib_qib module is loaded. The stop
+# operation is deprecated. It isn't intended for standalone use.
+
+# base name in /sys/class
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:$PATH
+export PATH
+qb=/sys/class/infiniband/qib
+serdes_parm=txselect
+
+if [ -r /etc/rdma/rdma.conf ]; then
+ IB_CONFIG=/etc/rdma/rdma.conf
+else
+ IB_CONFIG=/etc/infiniband/openib.conf
+fi
+if [ -f $IB_CONFIG ]; then
+ . $IB_CONFIG
+fi
+
+# If user specifies an override or the setting is ommitted from the config file
+# then default to new back plane version.
+if [ -z $QIB_QME_BPVER ]; then
+ QIB_QME_BPVER=1
+fi
+
+warn_and_log()
+{
+ echo "$0: $@"
+ logger -t infinipath "$@"
+}
+
+setup_qmh()
+{
+ local -i nunit=0 bay bl2xB=0 full=0
+ local parmf sysinfo bayinfo mez1bus mez2bus mez3bus=0 tbay
+ local -a parm bay_h1
+ for parm in parameters/${serdes_parm} ${serdes_parm}; do
+ if [ -e /sys/module/ib_qib/$parm ]; then
+ parmf=/sys/module/ib_qib/$parm
+ break;
+ fi
+ done
+ if [ ! "$parmf" ]; then
+ warn_and_log Unable to find ${serdes_parm} parameter
+ return
+ fi
+ sysinfo="$(PATH=/sbin:/usr/sbin:$PATH; dmidecode -t system | \
+ sed -e '/^Handle/d' -e '/^[ \t]*$/d' -e 's/[ \t]*$//' )"
+ if [ ! "$sysinfo" ]; then
+ warn_and_log Unable to determine system type
+ return
+ fi
+ bayinfo="$(PATH=/sbin:/usr/sbin:$PATH; dmidecode -t 204)"
+ if [ ! "$bayinfo" ]; then
+ warn_and_log Unable to determine bay
+ return
+ fi
+ case "${bayinfo}" in
+ *Server*Bay:*) tbay=$(PATH=/sbin:/usr/sbin:$PATH; dmidecode -t 204 | \
+ sed -n -e 's/[ \t]*$//' -e 's/[ \t]*Server Bay:[ \t]*//p') ;;
+ *) tbay=$(PATH=/sbin:/usr/sbin:$PATH; dmidecode -t 204 | \
+ sed -n -e '1,/BladeSystem/d' -e 's/ *$//' -e 's/^\t\t*//' \
+ -e '/^[0-9][AB]*$/p' -e '/^[0-9][0-9][AB]*$/p') ;;
+ esac
+
+ read pbase < $parmf
+ parm=($(echo ${qb}*))
+ nunit=${#parm[*]}
+
+ # [0] is a dummy in these arrays, bay #'ing starts at 1
+ # H1 value, per bay (same for both ports)
+ m1_bay_h1=(0 8 7 7 7 7 6 6 6 8 7 7 7 7 6 6 7)
+ m2_bay_h1=(0 11 11 11 11 11 11 10 11 11 11 11 11 10 10 10 10)
+ m3_bay_h1=(0 11 11 11 11 10 10 10 10)
+
+ # tx serdes index per bay for mez1 (either port)
+ mez1p1_idx=(0 2 2 17 17 17 1 1 1 2 1 17 17 16 2 18 16)
+ # tx serdes setting for mez1 p2 (only used on full-height blades)
+ mez1p2_idx=(0 4 4 3 3 3 2 4 4)
+ # tx serdes index per bay for mez2 port 1
+ mez2p1_idx=(0 2 2 17 17 17 1 1 1 2 1 17 17 16 2 18 1)
+ # tx serdes index per bay for mez2 port 2
+ mez2p2_idx=(0 2 2 19 1 1 1 1 1 2 1 18 17 1 19 1 1)
+ # tx serdes index per bay for mez3 port 1 (mez3 only on full-height blades)
+ mez3p1_idx=(0 2 1 18 17 1 19 1 1)
+ # tx serdes index per bay for mez3 port 2 (mez3 only on full-height blades)
+ mez3p2_idx=(0 2 1 17 17 16 2 18 1)
+
+ case "${sysinfo}" in
+ *BL280[cC]*) mez1bus=3 mez2bus=6 bay=$tbay ;;
+ # both nodes on the 2x220 blade have bus 3, only one mez, but
+ # they connect to different switches through different paths
+ # so A and B have different parameters. They connect to
+ # the switch as if they were the mez2 on other blade types,
+ # with port 1 on mez2 for A node and port 2 on mez2
+ # for the B node
+ *BL2x220[cC]*)
+ mez1bus=3 mez2bus=3 bay=${tbay%[AB]}
+ case "${tbay}" in
+ *A) bl2xB=${mez2p1_idx[$bay]} ;;
+ *B) bl2xB=${mez2p2_idx[$bay]} ;;
+ esac
+ ;;
+ *BL460[cC]*) mez1bus=6 mez2bus=9 bay=$tbay ;;
+ *BL465[cC]*) mez1bus=5 mez2bus=8 bay=$tbay ;;
+ *BL490[cC]*) mez1bus=6 mez2bus=7 bay=$tbay ;;
+ *BL685[cC]*) mez1bus=41 mez2bus=6 mez3bus=44 full=1 bay=$(($tbay % 9)) ;;
+ *) warn_and_log Unknown blade type "$sysinfo"
+ return ;;
+ esac
+
+ # mez1 only has port1 connected, mez2, mez3 can have both ports
+
+ # If only one card, and two mez possible, we have to figure out which
+ # mez we are plugged into.
+ # On RHEL4U8, we look in the driver subdir, all others
+ # in the device/driver subdir for the pcie bus.
+ pciprefix="[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]:"
+ if [ ${bl2xB} -ne 0 ]; then
+ pbase="${pbase} 0,1=${bl2xB},${m2_bay_h1[$bay]}"
+ else while [ $nunit -ne 0 ]; do
+ (( nunit-- ))
+ buspath=$(readlink -m ${qb}${nunit}/device)
+ if [ -n "$(echo ${buspath} | grep "${pciprefix}$(printf "%02d" ${mez1bus}):")" ]; then
+ pbase="${pbase} ${nunit},1=${mez1p1_idx[$bay]},${m1_bay_h1[$bay]}"
+ if [ ${full} -eq 1 ]; then
+ pbase="${pbase} ${nunit},2=${mez1p2_idx[$bay]},${m1_bay_h1[$bay]}"
+ fi
+ elif [ -n "$(echo ${buspath} | grep "${pciprefix}$(printf "%02d" ${mez2bus}):")" ]; then
+ pbase="${pbase} ${nunit},1=${mez2p1_idx[$bay]},${m2_bay_h1[$bay]}"
+ pbase="${pbase} ${nunit},2=${mez2p2_idx[$bay]},${m2_bay_h1[$bay]}"
+ elif [ -n "$(echo ${buspath} | grep "${pciprefix}$(printf "%02d" ${mez3bus}):")" ]; then
+ pbase="${pbase} ${nunit},1=${mez3p1_idx[$bay]},${m3_bay_h1[$bay]}"
+ pbase="${pbase} ${nunit},2=${mez3p2_idx[$bay]},${m3_bay_h1[$bay]}"
+ else
+ warn_and_log Mismatch on mezbus ${mez1_bus},${mez2_bus},${mez3_bus} \
+ and unit ${nunit}, no serdes setup
+ fi
+ done
+ fi
+ echo -n ${pbase} > $parmf
+}
+
+
+
+setup_qme()
+{
+ local parm parmf sn pbase
+ local -i nunit=0 bay idx bpver=${QIB_QME_BPVER:1}
+ local -a bp0_idx bp1_idx set
+
+ # tx settings for Dell Backplane v1.0
+ bp0_idx=( 0 22 23 24 25 26 24 27 28 22 23 24 25 26 24 27 28 )
+ # tx settings for Dell Backplane v1.1
+ bp1_idx=( 0 29 29 30 31 32 33 30 29 29 29 30 31 32 33 30 29 )
+
+ for parm in parameters/${serdes_parm} ${serdes_parm}; do
+ if [ -e /sys/module/ib_qib/$parm ]; then
+ parmf=/sys/module/ib_qib/$parm
+ break;
+ fi
+ done
+ if [ ! "$parmf" ]; then
+ warn_and_log Unable to find ${serdes_parm} parameter
+ return
+ fi
+
+ read pbase < $parmf
+ parm=( $(echo ${qb}*) )
+ nunit=${#parm[*]}
+
+ if [ -e /sys/module/ib_qib/parameters/qme_bp ]; then
+ read bpver < /sys/module/ib_qib/parameters/qme_bp
+ if [ ${bpver} -ne 0 -a ${bpver} -ne 1 ]; then
+ warn_and_log "Invalid Dell backplane version (${bpver}). Defaulting to 1."
+ bpver=1
+ fi
+ fi
+ eval 'set=( ${bp'${bpver}'_idx[@]} )'
+
+ # we get two serial numbers normally, use 2nd if present, else first
+ sn="$(dmidecode -t 2 | grep -i serial | tail -1)"
+ case ${sn} in
+ *[sS]erial\ [nN]umber*)
+ bay="$(echo $sn | sed -e 's/\.$//' -e 's/.*\.0*//' -e 's/[abcd]$//')"
+ if [ ${bay} -gt ${#set[@]} ]; then
+ warn_and_log Unexpected QME7342 bay info: ${sn}, no Tx params
+ return
+ fi
+ idx=${set[bay]}
+ # H1 is same for all QME bays, so no need to specify.
+ while [ $nunit -ne 0 ]; do
+ (( nunit-- ))
+ pbase="${pbase} ${nunit},1=${idx} ${nunit},2=${idx}"
+ done
+ echo -n ${pbase} > $parmf
+ ;;
+ *) warn_and_log No QME7342 bay information, no Tx params
+ return;;
+ esac
+}
+
+has_qib=$(lspci -n 2>/dev/null | grep -i "1077\|1fc1")
+if [ ! "${has_qib}" ]; then
+ exit 0
+fi
+
+case "$1" in
+start)
+ has_qmh7342=$(grep QMH7342 ${qb}*/hca_type 2>/dev/null)
+ if [ "${has_qmh7342}" ]; then
+ setup_qmh
+ else
+ has_qme7342=$(grep QME7342 ${qb}*/hca_type 2>/dev/null)
+ if [ "${has_qme7342}" ]; then
+ setup_qme
+ fi
+ fi
+
+ ;;
+stop)
+ warn_and_log stop operation deprecated
+ ;;
+esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libipathverbs-1.2.1/truescale.conf new/libipathverbs-1.3/truescale.conf
--- old/libipathverbs-1.2.1/truescale.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/libipathverbs-1.3/truescale.conf 2014-07-23 22:52:55.000000000 +0200
@@ -0,0 +1 @@
+install ib_qib modprobe -i ib_qib $CMDLINE_OPTS && /usr/sbin/truescale-serdes.cmds start
++++++ libipathverbs-configure.patch ++++++
--- /var/tmp/diff_new_pack.TM2zXz/_old 2015-02-16 21:14:32.000000000 +0100
+++ /var/tmp/diff_new_pack.TM2zXz/_new 2015-02-16 21:14:32.000000000 +0100
@@ -1,29 +1,23 @@
----
- configure.ac | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-Index: configure.ac
-===================================================================
---- configure.ac.orig 2014-02-07 20:44:31.000000000 +0100
-+++ configure.ac 2014-02-13 17:56:04.883274885 +0100
-@@ -35,13 +35,12 @@ dnl Patent licenses, if any, provided he
+--- a/configure.in 2014-07-23 23:01:58.000000000 +0200
++++ b/configure.in 2015-02-09 23:12:37.682799913 +0100
+@@ -36,13 +36,12 @@
dnl combinations of this program with other software, or any other
dnl product whatsoever.
-AC_PREREQ(2.57)
--AC_INIT(libipathverbs, 1.2.1, support@qlogic.com)
+-AC_INIT(libipathverbs, 1.3, ibsupport@intel.com)
+AC_PREREQ(2.63)
-+AC_INIT([libipathverbs],[1.2.1],[support@qlogic.com])
++AC_INIT([libipathverbs], 1.3, ibsupport@intel.com)
AC_CONFIG_SRCDIR([src/ipathverbs.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(libipathverbs, 1.2.1)
+-AM_INIT_AUTOMAKE(libipathverbs, 1.3)
-AM_PROG_LIBTOOL
+AM_INIT_AUTOMAKE([-Wall foreign])
AC_ARG_WITH([valgrind],
AC_HELP_STRING([--with-valgrind],
-@@ -58,7 +57,8 @@ fi
+@@ -59,7 +58,8 @@
dnl Checks for programs
AC_PROG_CC
@@ -33,8 +27,8 @@
dnl Checks for libraries
AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],
AC_MSG_ERROR([ibv_get_device_list() not found. libipathverbs requires libibverbs.]))
-@@ -102,4 +102,4 @@ AC_CACHE_CHECK(whether ld accepts --vers
- AC_SUBST(IPATHVERBS_VERSION_SCRIPT)
+@@ -115,4 +115,4 @@
+ type rpm > /dev/null 2>&1 && (rpm -qa | grep -q dracut) )
AC_CONFIG_FILES([Makefile libipathverbs.spec])
-AC_OUTPUT
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org