refresh (create temporary patch)

diff --git a/meta b/meta
index f17953c3de091de5a069b0816e2320512ab2abbc..5b53ecfc9719e88280a66b90535d6aebd4aa3870 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,8 @@
 Version: 1
-Previous: 3a3be96fa9a2e702589ffed53773aa3d286ba830
-Head: 5e532c37dd8c6b45cf168c670c7d4e9eebc83239
+Previous: d9f08e132446fe503e3d83b33a797acea0356ef1
+Head: ed195392a336bf9fa201918860312cdc9f57d7cb
 Applied:
   atomic: 5e532c37dd8c6b45cf168c670c7d4e9eebc83239
+  refresh-temp: ed195392a336bf9fa201918860312cdc9f57d7cb
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..55bd8b7
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,24 @@
+Bottom: 82b37f69cd97e9066b5128b783b6674217c7ed45
+Top:    9c0d7b60a142530a1903dedf47aa9e62d53b42ef
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-08-25 12:17:18 -0700
+
+Refresh of atomic
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index f443091..4bd4bd5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
+ 
++if DEFINE_ATOMICS
++      AM_CFLAGS += -DDEFINE_ATOMICS
++endif
++
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ib_acm
+ svc_ib_acm_SOURCES = src/acm.c