refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..fb1f871
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,37 @@
+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