rpms/libmlx4/devel libmlx4-mlx4.conf, NONE, 1.1 libmlx4-modprobe.conf, NONE, 1.1 libmlx4-setup-mlx4.awk, NONE, 1.1 libmlx4.spec, 1.4, 1.5

[Doug Ledford]

Author: dledford

Update of /cvs/extras/rpms/libmlx4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3279

Modified Files:
	libmlx4.spec 
Added Files:
	libmlx4-mlx4.conf libmlx4-modprobe.conf libmlx4-setup-mlx4.awk 
Log Message:
* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
- Merge various bits from Red Hat package into Fedora package



--- NEW FILE libmlx4-mlx4.conf ---
# Config file for mlx4 hardware port settings
# This file is read when the mlx4_core module is loaded and used to
# set the port types for any hardware found.  If a card is not listed
# in this file, then its port types are left alone.
#
# Format:
# <pci_device_of_card> <port1_type> <port2_type>
#
# Example:
# 0000:0b:00.0 eth eth
#
# You can find the right pci device to use for any given card by loading
# the mlx4_core module, then going to /sys/bus/pci/drivers/mlx4_core and
# seeing what possible PCI devices are listed there.  The possible values
# for ports are: ib, eth, and auto.  However, not all cards support all
# types, so if you get messages from the kernel that your selected port
# type isn't supported, there's nothing this script can do about it.  Also,
# some cards don't support using different types on the two ports (aka,
# both ports must be either eth or ib).  Again, we can't set what the kernel
# won't support.  Also, on single port cards, any setting for the
# second port will be ignored.


--- NEW FILE libmlx4-modprobe.conf ---
install mlx4_core /sbin/modprobe --ignore-install mlx4_core && if [ -f /etc/ofed/setup-mlx4.awk -a -f /etc/ofed/mlx4.conf ]; then awk -f /etc/ofed/setup-mlx4.awk /etc/ofed/mlx4.conf /sbin/setup-mlx4; fi; /sbin/modprobe mlx4_en; /sbin/modprobe mlx4_ib


--- NEW FILE libmlx4-setup-mlx4.awk ---
BEGIN {
	dir="/sys/bus/pci/drivers/mlx4_core"
	if (system("[ -d "dir" ]") != 0)
		exit 1
}
/^[[:xdigit:]]+:[[:xdigit:]]+:[[:xdigit:]]+\.[[:xdigit:]]([[:blank:]](ib|eth|auto))+/ {
	device=$1
	port1=$2
	port2=$3
	if (system("[ -d "dir"/"device" ]") != 0)
		next
	if (system("[ -f "dir"/"device"/port_trigger ]") == 0)
		print "all" > dir"/"device"/port_trigger"
	if (system("[ -f "dir"/"device"/mlx4_port2 ]") == 0)
		print port2 > dir"/"device"/mlx4_port2"
	if (system("[ -f "dir"/"device"/mlx4_port1 ]") == 0)
		print port1 > dir"/"device"/mlx4_port1"
}


Index: libmlx4.spec
===================================================================
RCS file: /cvs/extras/rpms/libmlx4/devel/libmlx4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libmlx4.spec	2 Dec 2009 00:55:07 -0000	1.4
+++ libmlx4.spec	2 Dec 2009 01:15:12 -0000	1.5
@@ -1,12 +1,15 @@
 Name: libmlx4
 Version: 1.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mellanox ConnectX InfiniBand HCA Userspace Driver
 Provides: libibverbs-driver
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://openib.org/
 Source: http://openib.org/downloads/mlx4/%{name}-%{version}.tar.gz
+Source1: libmlx4-modprobe.conf
+Source2: libmlx4-mlx4.conf
+Source3: libmlx4-setup-mlx4.awk
 Patch0: libmlx4-0001-Remove-empty-stubs-for-detach-attach_mcast.patch
 Patch1: libmlx4-0002-Use-mmap-MAP_ANONYMOUS-to-allocate-queue-buffers.patch
 Patch2: libmlx4-0003-mmap-needs-some-includes.patch
@@ -14,18 +17,22 @@ Patch3: libmlx4-0004-Fix-version-in-taba
 Patch4: libmlx4-0005-Update-function-prototypes-to-match-libibverbs-enum-.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: libibverbs-devel >= 1.1.3
+%ifnarch ia64
+BuildRequires: valgrind-devel
+%endif
 
 %description
 libmlx4 provides a device-specific userspace driver for Mellanox
 ConnectX HCAs for use with the libibverbs library.
 
-%package devel
-Summary: Development files for the libmlx4 driver
+%package static
+Summary: Static version of the libmlx4 driver
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
-Provides: libmlx4-static = %{version}-%{release}
+Provides: libmlx4-devel = %{version}-%{release}
+Obsoletes: libmlx4-devel <= 1.0
 
-%description devel
+%description static
 Static version of libmlx4 that may be linked directly to an
 application, which may be useful for debugging.
 
@@ -38,12 +45,19 @@ application, which may be useful for deb
 %patch4 -p1
 
 %build
+%ifnarch ia64
+%configure --with-valgrind
+%else
 %configure
+%endif
 make CFLAGS="$CFLAGS -fno-strict-aliasing" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=%{buildroot} install
+install -D -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/libmlx4.conf
+install -D -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/rdma/mlx4.conf
+install -D -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/rdma/setup-mlx4.awk
 # remove unpackaged files from the buildroot
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libmlx4.so
 
@@ -54,13 +68,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/libmlx4-rdmav2.so
 %{_sysconfdir}/libibverbs.d/mlx4.driver
+%{_sysconfdir}/modprobe.d/libmlx4.conf
+%config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
+%{_sysconfdir}/rdma/setup-mlx4.awk
 %doc AUTHORS COPYING README
 
-%files devel
+%files static
 %defattr(-,root,root,-)
 %{_libdir}/libmlx4.a
 
 %changelog
+* Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-2
+- Merge various bits from Red Hat package into Fedora package
+
 * Tue Dec 01 2009 Doug Ledford <dledford at redhat.com> - 1.0.1-1
 - Update to latest upstream release
 - Add pseudo provides of libibverbs-driver