refresh

diff --git a/meta b/meta
index 095e734cef26766269af5c54fa93276345f0b9d5..16d47577bb1299153658b03ea4b4d7445cafecf6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 9e2d761179502cdd843857faae1723a28be796d1
-Head: e58b6531430171eedd86f2188a14d95ed37ab96d
+Previous: fa7817a2aba27183514cc0cb14bb13a49681a4f2
+Head: c422ec9f9acd2728ae3655030c3cec67bdcc07d2
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 693b33183e2e4352157933034ae18f340dd4ccac
-  refresh-temp: e58b6531430171eedd86f2188a14d95ed37ab96d
+  daemonize: c422ec9f9acd2728ae3655030c3cec67bdcc07d2
 Unapplied:
   rel-1.0.6: 2a161b8365c9062529e0f46f9872631b42599bfb
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index a9986f127809ce7217b707c97802ddfaaf0de864..60583015eb31968c0bec581d6c292d093a8b9407 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    8285b68cb4f3673b766a8f3737ad90d34cbf9272
+Top:    f5032fb53161107c1c6cef8a3b4bf1ef5f23ba50
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -64,6 +64,18 @@ index 503ad72..dea90f2 100644
  
  dist-hook: ibacm.spec
        cp ibacm.spec $(distdir)
+diff --git a/configure.in b/configure.in
+index 736f657..10b0c36 100644
+--- a/configure.in
++++ b/configure.in
+@@ -58,6 +58,7 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
+     fi)\r
+ \r
+ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
++AC_DEFINE(ACM_DEST_DIR, "\"$(sysconfdir)\"", [setting configuration directory])\r
+ \r
+ AC_CONFIG_FILES([Makefile ibacm.spec])\r
+ AC_OUTPUT\r
 diff --git a/ibacm.init b/ibacm.init
 new file mode 100644
 index 0000000..8f863eb

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a3c369b..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 8285b68cb4f3673b766a8f3737ad90d34cbf9272
-Top:    f5032fb53161107c1c6cef8a3b4bf1ef5f23ba50
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-02 14:29:31 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/configure.in b/configure.in
-index 736f657..10b0c36 100644
---- a/configure.in
-+++ b/configure.in
-@@ -58,6 +58,7 @@ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
-     fi)\r
- \r
- AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$ac_cv_version_script" = "yes")\r
-+AC_DEFINE(ACM_DEST_DIR, "\"$(sysconfdir)\"", [setting configuration directory])\r
- \r
- AC_CONFIG_FILES([Makefile ibacm.spec])\r
- AC_OUTPUT