From 01e03ee2eb675a3489ad5d33cc513c2808165ef5 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 23 Jul 2010 10:58:21 -0700 Subject: [PATCH] commit --- meta | 3 +-- patches/sbin | 40 ---------------------------------------- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 patches/sbin diff --git a/meta b/meta index 1181982..a82a2f3 100644 --- a/meta +++ b/meta @@ -1,8 +1,7 @@ Version: 1 -Previous: bef6ecb76573afd318e47520024479baf5f6f133 +Previous: 591559d51a484435c4dfe53ea539e2643cf853a5 Head: 77c6fc6fba7460ad73253bcb2e6f448b71399b5c Applied: - sbin: ddfcfe3b90693d65f63b3a172923fff844dce1f9 rel1.0.1: 77c6fc6fba7460ad73253bcb2e6f448b71399b5c Unapplied: ofed: e3776dfac43e3529400730e48d41d35378d4cf72 diff --git a/patches/sbin b/patches/sbin deleted file mode 100644 index 957cc61..0000000 --- a/patches/sbin +++ /dev/null @@ -1,40 +0,0 @@ -Bottom: dbd88d4c36330147abc852e6fd09aca32695d270 -Top: 1193b530c6bb498c91bfb2ff2c033e5d2a60a886 -Author: Sean Hefty -Date: 2010-07-02 10:58:57 -0700 - -ibacm: install ib_acm into sbin instead of bin directory - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/Makefile.am b/Makefile.am -index 69c57c7..f443091 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,8 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux - - AM_CFLAGS = -g -Wall -D_GNU_SOURCE - --bin_PROGRAMS = svc/ib_acm util/ib_acme -+bin_PROGRAMS = util/ib_acme -+sbin_PROGRAMS = svc/ib_acm - svc_ib_acm_SOURCES = src/acm.c - util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_linux.c - svc_ib_acm_CFLAGS = $(AM_CFLAGS) -diff --git a/ibacm.spec.in b/ibacm.spec.in -index 5c89be3..c461f91 100644 ---- a/ibacm.spec.in -+++ b/ibacm.spec.in -@@ -44,7 +44,8 @@ rm -rf $RPM_BUILD_ROOT - %files - %defattr(-,root,root,-) - %doc AUTHORS COPYING README --%{_bindir}/* -+%{_bindir}/ib_acme -+%{_sbindir}/ib_acm - %{_mandir}/man1/* - %{_mandir}/man7/* - %{_includedir}/infiniband/acm.h -- 2.41.0