commit

diff --git a/meta b/meta
index 64d6f66f48dd4955f0c81f2c25fa1dff238961e0..4efbd41ac0e4ecec75a9a88439e0692bed3fcd89 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 932884a1977374189ad93e090504b0d08802a302
+Previous: 028d512e5a026d598fe563285bbe0e2a520871c6
 Head: 9b1229c3f6443d92c9b41c0be8aa34fa2263b554
 Applied:
-  fix-pkg: bcde473f7369d1f743eb9dbb5d170339905eccf5
   rel-1.0.1: 9b1229c3f6443d92c9b41c0be8aa34fa2263b554
 Unapplied:
 Hidden:

diff --git a/patches/fix-pkg b/patches/fix-pkg
deleted file mode 100644 (file)
index b24b690..0000000
--- a/patches/fix-pkg
+++ /dev/null
@@ -1,88 +0,0 @@
-Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Top:    45e517f0c814f975a23047f12e93b9106de03972
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-21 09:08:39 -0700
-
-ibacm: fixup package name and installation for inclusion into OFED
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 46f68d4..f36c086 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,14 +8,17 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
- svc_ib_acm_CFLAGS = $(AM_CFLAGS)
- util_ib_acme_CFLAGS = $(AM_CFLAGS)
- 
--ib_acmincludedir = $(includedir)/infiniband
-+ibacmincludedir = $(includedir)/infiniband
- 
--ib_acminclude_HEADERS = include/infiniband/acm.h
-+ibacminclude_HEADERS = include/infiniband/acm.h
- 
- man_MANS = \
-       man/ib_acme.1 \
-       man/ib_acm.1 \
-       man/ib_acm.7
- 
--EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h linux/osd.h linux/dlist.h $(man_MANS)
-+EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h \
-+           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
- 
-+dist-hook: ibacm.spec
-+      cp ibacm.spec $(distdir)
-diff --git a/configure.in b/configure.in
-index 9311602..da59fdd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,11 +1,11 @@
- dnl Process this file with autoconf to produce a configure script.\r
- \r
- AC_PREREQ(2.57)\r
--AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org)\r
- AC_CONFIG_SRCDIR([src/acm.c])\r
- AC_CONFIG_AUX_DIR(config)\r
- AM_CONFIG_HEADER(config.h)\r
--AM_INIT_AUTOMAKE(ib_acm, 1.0.0)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.0)\r
- \r
- AM_PROG_LIBTOOL\r
- \r
-@@ -25,9 +25,9 @@ AC_CHECK_SIZEOF(long)
- dnl Checks for libraries\r
- if test "$disable_libcheck" != "yes"; then\r
- AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],\r
--    AC_MSG_ERROR([ibv_get_device_list() not found.  ib_acm requires libibverbs.]))\r
-+    AC_MSG_ERROR([ibv_get_device_list() not found.  ibacm requires libibverbs.]))\r
- AC_CHECK_LIB(ibumad, umad_send, [],\r
--    AC_MSG_ERROR([umad_send() not found.  ib_acm requires libibumad.]))\r
-+    AC_MSG_ERROR([umad_send() not found.  ibacm requires libibumad.]))\r
- fi\r
- \r
- dnl Checks for header files.\r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 2c10e1c..85bd6d6 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,6 +1,6 @@
- %define ver @VERSION@
- 
--Name: ib_acm
-+Name: ibacm
- Version: 1.0.0
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant
-@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- BuildRequires: libibverbs-devel >= 1.1-1
- 
- %description
--ib_acm assists with establishing communication over Infiniband.
-+ibacm assists with establishing communication over Infiniband.
- 
- %package svc
- Summary: IB CM pre-connection service application