refresh

diff --git a/meta b/meta
index 4943e56f4867a5b883f22c87fc6d9efd88f36a0b..b95b69e06a89fd4598a24d406e806dfa2816205d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 2245f4671b1697fa877cc66014a180ad9cb9c63b
-Head: ee65f17102d535c854859e768ce309588a81ee02
+Previous: 4948c79496f71fce5eb20d2e36e1c66da38aa981
+Head: 086d289564d54a90b53e3f3943860da7105c13ed
 Applied:
   sa: 4360bd4a4279fa5f6c83f7d9bfeee9d1a46c6904
-  sbin: bc5b2338ea04afdf768a9489f2cd23b283443c6e
-  refresh-temp: ee65f17102d535c854859e768ce309588a81ee02
+  sbin: 086d289564d54a90b53e3f3943860da7105c13ed
 Unapplied:
   rel1.0.1: 0bbb1b7266ceb28e8bd5fa26c19dae03d379f851
   ofed: e3776dfac43e3529400730e48d41d35378d4cf72

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 12c5a26..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,36 +0,0 @@
-Bottom: 2b51c989f7f69b7518bcb1f7847a4cdb102d05f8
-Top:    42fb1c4fba838c342685860b740aa5bc5fb31d85
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-02 13:59:23 -0700
-
-Refresh of sbin
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index 69c57c7..fac5a9c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
- 
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE
- 
--bin_PROGRAMS = svc/ib_acm util/ib_acme
-+sbin_PROGRAMS = svc/ib_acm util/ib_acme
- 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 21ba878..eace328 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -44,8 +44,7 @@ rm -rf $RPM_BUILD_ROOT
- %files
- %defattr(-,root,root,-)
- %doc AUTHORS COPYING README
--%{_sbindir}/ib_acm
--%{_sbindir}/ib_acme
-+%{_sbindir}/*
- %{_mandir}/man1/*
- %{_mandir}/man7/*
- %{_includedir}/infiniband/acm.h

diff --git a/patches/sbin b/patches/sbin
index 1bdddad7383329cb3cbcc5b14863fd988a3c0075..32351bbe48289a0a3009190d005ea14b1f334d61 100644 (file)
--- a/patches/sbin
+++ b/patches/sbin
@@ -1,5 +1,5 @@
 Bottom: dbd88d4c36330147abc852e6fd09aca32695d270
-Top:    2b51c989f7f69b7518bcb1f7847a4cdb102d05f8
+Top:    42fb1c4fba838c342685860b740aa5bc5fb31d85
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-02 10:58:57 -0700
 
@@ -10,17 +10,29 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/Makefile.am b/Makefile.am
+index 69c57c7..fac5a9c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
+ 
+-bin_PROGRAMS = svc/ib_acm util/ib_acme
++sbin_PROGRAMS = svc/ib_acm util/ib_acme
+ 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..21ba878 100644
+index 5c89be3..eace328 100644
 --- a/ibacm.spec.in
 +++ b/ibacm.spec.in
-@@ -44,7 +44,8 @@ rm -rf $RPM_BUILD_ROOT
+@@ -44,7 +44,7 @@ rm -rf $RPM_BUILD_ROOT
  %files
  %defattr(-,root,root,-)
  %doc AUTHORS COPYING README
 -%{_bindir}/*
-+%{_sbindir}/ib_acm
-+%{_sbindir}/ib_acme
++%{_sbindir}/*
  %{_mandir}/man1/*
  %{_mandir}/man7/*
  %{_includedir}/infiniband/acm.h