refresh

diff --git a/meta b/meta
index 409d05fd0f9f504021b7762e351167f7a67aec24..1add0d935c118726678fa2f180ed32b1358f81ba 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 680f416ac2dd833131ec21366ae82c605b3afddf
-Head: 9f8a0b2cb549a9a13c1a3a242c477e6397b43c09
+Previous: 1d23c36adb8e4ecaeed5951b504ed2f79bc1c433
+Head: 754494566259b4da96d1c3d64c836d0fd45c4861
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: ff3d79a44beb17d1ba7e3eb724de877ae0eeebb5
   bld: 6f341666bd82212d870b86b7ac9bb298a686ff90
-  bldwrn: fef0aba1c05ae8f9a778e71c6cd9d6b28b5554ac
-  refresh-temp: 9f8a0b2cb549a9a13c1a3a242c477e6397b43c09
+  bldwrn: 754494566259b4da96d1c3d64c836d0fd45c4861
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/bldwrn b/patches/bldwrn
index 93945b7151d2e9edf59da82e9ffe594c10e72b69..fd59338af229afcdcc577fc073137018944e0749 100644 (file)
--- a/patches/bldwrn
+++ b/patches/bldwrn
@@ -1,5 +1,5 @@
 Bottom: 53ca218735ea10a919e7a5cd4f7e3b2638e7713e
-Top:    53ca218735ea10a919e7a5cd4f7e3b2638e7713e
+Top:    8417a3cff1e2c43ea7b21fdd0ac5edbb01ba7cc5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-30 10:06:36 -0700
 
@@ -10,4 +10,14 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/configure.in b/configure.in
+index 7fc4761..293a7ce 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([src/acm.c])
+ AC_CONFIG_AUX_DIR(config)\r
+ AM_CONFIG_HEADER(config.h)\r
+ AM_INIT_AUTOMAKE(ibacm, 1.0.4)\r
++m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
+ \r
+ AM_PROG_LIBTOOL

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7d57899..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: 53ca218735ea10a919e7a5cd4f7e3b2638e7713e
-Top:    8417a3cff1e2c43ea7b21fdd0ac5edbb01ba7cc5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-30 10:07:20 -0700
-
-Refresh of bldwrn
-
----
-
-diff --git a/configure.in b/configure.in
-index 7fc4761..293a7ce 100644
---- a/configure.in
-+++ b/configure.in
-@@ -6,6 +6,7 @@ AC_CONFIG_SRCDIR([src/acm.c])
- AC_CONFIG_AUX_DIR(config)\r
- AM_CONFIG_HEADER(config.h)\r
- AM_INIT_AUTOMAKE(ibacm, 1.0.4)\r
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])\r
- \r
- AM_PROG_LIBTOOL