refresh

diff --git a/meta b/meta
index 85cd2eb014c121980ae5cefce0539becb0071cea..e79c89f439289e51251f9d8433132fcc374659c0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 473629d90016dee2054f92f3e96f456a0ca85267
-Head: fa10d156c79d864a1723b200ef2b2bd447bdc9be
+Previous: 3770fcc9a19e9dc2b9938c187d17b58aa2edef74
+Head: 831e94b74c97724170417ee3a4bc12d2f866ff37
 Applied:
   sa: 4360bd4a4279fa5f6c83f7d9bfeee9d1a46c6904
-  sbin: 086d289564d54a90b53e3f3943860da7105c13ed
-  refresh-temp: fa10d156c79d864a1723b200ef2b2bd447bdc9be
+  sbin: 831e94b74c97724170417ee3a4bc12d2f866ff37
 Unapplied:
   rel1.0.1: edbd93a617a50b5b006d0f12b73a8b5604638217
   ofed: e3776dfac43e3529400730e48d41d35378d4cf72

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fb1f871..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,37 +0,0 @@
-Bottom: 42fb1c4fba838c342685860b740aa5bc5fb31d85
-Top:    1193b530c6bb498c91bfb2ff2c033e5d2a60a886
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-02 14:11:18 -0700
-
-Refresh of sbin
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index fac5a9c..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
- 
--sbin_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 eace328..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
--%{_sbindir}/*
-+%{_bindir}/ib_acme
-+%{_sbindir}/ib_acm
- %{_mandir}/man1/*
- %{_mandir}/man7/*
- %{_includedir}/infiniband/acm.h

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