From: Sean Hefty Date: Mon, 21 Jun 2010 16:12:55 +0000 (-0700) Subject: rename X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4248b76b9ef1d18f23934c319a76efe4f3804fea;p=~shefty%2Fibacm.git rename --- diff --git a/meta b/meta index 14e158a..c93630c 100644 --- a/meta +++ b/meta @@ -1,7 +1,7 @@ Version: 1 -Previous: db31e895e8012180c37e26cc267669ea4267d466 +Previous: 8e96f3db0f3afcd0a27cf54b1caa89f7173d9d17 Head: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2 Applied: - ibacm-fixup-package-name-and-i: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2 + fix-pkg: 70ba851bc652bc2eb8bdcf1d4138703b0db287c2 Unapplied: Hidden: diff --git a/patches/fix-pkg b/patches/fix-pkg new file mode 100644 index 0000000..86f80c3 --- /dev/null +++ b/patches/fix-pkg @@ -0,0 +1,79 @@ +Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80 +Top: 0b2115751401c86f009f07809c320f5c586325d2 +Author: Sean Hefty +Date: 2010-06-21 09:08:39 -0700 + +ibacm: fixup package name and installation for inclusion into OFED + +Signed-off-by: Sean Hefty + + +--- + +diff --git a/Makefile.am b/Makefile.am +index 46f68d4..b0d5fff 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,9 +8,9 @@ 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 \ +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. + + AC_PREREQ(2.57) +-AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org) ++AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org) + AC_CONFIG_SRCDIR([src/acm.c]) + AC_CONFIG_AUX_DIR(config) + AM_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE(ib_acm, 1.0.0) ++AM_INIT_AUTOMAKE(ibacm, 1.0.0) + + AM_PROG_LIBTOOL + +@@ -25,9 +25,9 @@ AC_CHECK_SIZEOF(long) + dnl Checks for libraries + if test "$disable_libcheck" != "yes"; then + AC_CHECK_LIB(ibverbs, ibv_get_device_list, [], +- AC_MSG_ERROR([ibv_get_device_list() not found. ib_acm requires libibverbs.])) ++ AC_MSG_ERROR([ibv_get_device_list() not found. ibacm requires libibverbs.])) + AC_CHECK_LIB(ibumad, umad_send, [], +- AC_MSG_ERROR([umad_send() not found. ib_acm requires libibumad.])) ++ AC_MSG_ERROR([umad_send() not found. ibacm requires libibumad.])) + fi + + dnl Checks for header files. +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 diff --git a/patches/ibacm-fixup-package-name-and-i b/patches/ibacm-fixup-package-name-and-i deleted file mode 100644 index 86f80c3..0000000 --- a/patches/ibacm-fixup-package-name-and-i +++ /dev/null @@ -1,79 +0,0 @@ -Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80 -Top: 0b2115751401c86f009f07809c320f5c586325d2 -Author: Sean Hefty -Date: 2010-06-21 09:08:39 -0700 - -ibacm: fixup package name and installation for inclusion into OFED - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/Makefile.am b/Makefile.am -index 46f68d4..b0d5fff 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,9 +8,9 @@ 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 \ -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. - - AC_PREREQ(2.57) --AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org) -+AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org) - AC_CONFIG_SRCDIR([src/acm.c]) - AC_CONFIG_AUX_DIR(config) - AM_CONFIG_HEADER(config.h) --AM_INIT_AUTOMAKE(ib_acm, 1.0.0) -+AM_INIT_AUTOMAKE(ibacm, 1.0.0) - - AM_PROG_LIBTOOL - -@@ -25,9 +25,9 @@ AC_CHECK_SIZEOF(long) - dnl Checks for libraries - if test "$disable_libcheck" != "yes"; then - AC_CHECK_LIB(ibverbs, ibv_get_device_list, [], -- AC_MSG_ERROR([ibv_get_device_list() not found. ib_acm requires libibverbs.])) -+ AC_MSG_ERROR([ibv_get_device_list() not found. ibacm requires libibverbs.])) - AC_CHECK_LIB(ibumad, umad_send, [], -- AC_MSG_ERROR([umad_send() not found. ib_acm requires libibumad.])) -+ AC_MSG_ERROR([umad_send() not found. ibacm requires libibumad.])) - fi - - dnl Checks for header files. -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