unshare exec/icmap.so

Signed-off-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Fabio Di Nitto <fdinitto@redhat.com>

corosync.spec.in

@@ -247,7 +247,6 @@ This package contains corosync libraries.
 %{_libdir}/libcmap.so.*
 %{_libdir}/libevs.so.*
 %{_libdir}/libtotem_pg.so.*
-%{_libdir}/libicmap.so.*
 %{_libdir}/libquorum.so.*
 %{_libdir}/libvotequorum.so.*
 %{_libdir}/libpload.so.*
@@ -297,7 +296,6 @@ The Corosync Cluster Engine APIs.
 %{_includedir}/corosync/lcr/lcr_ifact.h
 %dir %{_includedir}/corosync/engine
 %{_includedir}/corosync/engine/config.h
-%{_includedir}/corosync/engine/icmap.h
 %{_includedir}/corosync/engine/quorum.h
 %{_libdir}/libcfg.so
 %{_libdir}/libcpg.so
@@ -308,7 +306,6 @@ The Corosync Cluster Engine APIs.
 %{_libdir}/libvotequorum.so
 %{_libdir}/libpload.so
 %{_libdir}/libsam.so
-%{_libdir}/libicmap.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/cpg_*3*
 %{_mandir}/man3/evs_*3*

exec/Makefile.am

@@ -42,22 +42,20 @@ if BUILD_RDMA
 TOTEM_SRC		+= totemiba.c
 endif
 
-ICMAP_SRC		= icmap.c
 LCRSO_SRC		= vsf_ykd.c coroparse.c vsf_quorum.c
 LCRSO_OBJS		= $(LCRSO_SRC:%.c=%.o)
 LCRSO			= $(LCRSO_SRC:%.c=%.lcrso)
 
-lib_LIBRARIES		= libtotem_pg.a libicmap.a
+lib_LIBRARIES		= libtotem_pg.a
 sbin_PROGRAMS		= corosync
 
 libtotem_pg_a_SOURCES	= $(TOTEM_SRC)
-libicmap_a_SOURCES	= $(ICMAP_SRC)
 
 corosync_SOURCES 	= main.c ipc_glue.c util.c sync.c apidef.c service.c \
 			  timer.c totemconfig.c mainconfig.c quorum.c schedwrk.c \
-			  ../lcr/lcr_ifact.c evil.c syncv2.c logsys.c
-corosync_LDADD	  	= -ltotem_pg -licmap $(LIBQB_LIBS) $(statgrab_LIBS)
-corosync_DEPENDENCIES	= libtotem_pg.so.$(SONAME) libicmap.so.$(SONAME)
+			  ../lcr/lcr_ifact.c evil.c syncv2.c logsys.c icmap.c
+corosync_LDADD	  	= -ltotem_pg $(LIBQB_LIBS) $(statgrab_LIBS)
+corosync_DEPENDENCIES	= libtotem_pg.so.$(SONAME)
 corosync_LDFLAGS	= $(OS_DYFLAGS) -L./
 
 TOTEM_OBJS		= $(TOTEM_SRC:%.c=%.o)
@@ -78,18 +76,13 @@ EXTRA_DIST		= $(LCRSO_SRC)
 
 if BUILD_DARWIN
 %.lcrso: %.o
-	$(CC) $(LDFLAGS) $(CFLAGS) -L$(top_builddir)/exec -licmap -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
+	$(CC) $(LDFLAGS) $(CFLAGS) -L$(top_builddir)/exec -bundle -bind_at_load -bundle_loader ./corosync $^ -o $@
 
 libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(TOTEM_OBJS) -o $@ -lpthread
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
 
-libicmap.so.$(SONAME): $(ICMAP_OBJS)
-	$(CC) $(LDFLAGS) $(DARWIN_OPTS) $(ICMAP_OBJS) -o $@ -lpthread
-	ln -sf libicmap.so.$(SONAME) libicmap.so
-	ln -sf libicmap.so.$(SONAME) libicmap.so.$(SOMAJOR)
-
 else
 
 if BUILD_SOLARIS
@@ -113,13 +106,6 @@ libtotem_pg.so.$(SONAME): $(TOTEM_OBJS)
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so
 	ln -sf libtotem_pg.so.$(SONAME) libtotem_pg.so.$(SOMAJOR)
 
-libicmap.so.$(SONAME): $(ICMAP_OBJS)
-	$(CC) -shared -o $@ \
-		-Wl,-soname=libicmap.so.$(SOMAJOR) \
-		$(LDFLAGS) $^ -lpthread
-	ln -sf libicmap.so.$(SONAME) libicmap.so
-	ln -sf libicmap.so.$(SONAME) libicmap.so.$(SOMAJOR)
-
 endif
 
 endif

exec/coroparse.c

@@ -59,7 +59,7 @@
 #include <qb/qbutil.h>
 #define LOGSYS_UTILS_ONLY 1
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 #include <corosync/engine/config.h>
 
 #include "util.h"

exec/icmap.c

@@ -41,7 +41,7 @@
 
 #include <qb/qbdefs.h>
 #include <corosync/list.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #define ICMAP_MAX_VALUE_LEN	(16*1024)
 

exec/ipc_glue.c

@@ -52,7 +52,7 @@
 #include <corosync/corodefs.h>
 #include <corosync/totem/totempg.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #include "mainconfig.h"
 #include "sync.h"

exec/main.c

@@ -109,7 +109,7 @@
 #include <corosync/totem/totempg.h>
 #include <corosync/engine/config.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #include "quorum.h"
 #include "totemsrp.h"

exec/mainconfig.c

@@ -50,7 +50,7 @@
 #include <corosync/list.h>
 #include <corosync/totem/totem.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #include "util.h"
 #include "mainconfig.h"

exec/service.c

@@ -46,7 +46,7 @@
 #include "mainconfig.h"
 #include "util.h"
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #include "timer.h"
 #include <corosync/totem/totempg.h>

exec/totemconfig.c

@@ -55,7 +55,7 @@
 #include <corosync/totem/totem.h>
 #include <corosync/config.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #ifdef HAVE_LIBNSS
 #include <nss.h>

exec/vsf_quorum.c

@@ -67,7 +67,7 @@
 #include <corosync/coroapi.h>
 #include <corosync/logsys.h>
 #include <corosync/engine/quorum.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 LOGSYS_DECLARE_SUBSYS ("QUORUM");
 

include/Makefile.am

@@ -37,11 +37,11 @@ CS_H			= hdb.h cs_config.h cpg.h cfg.h evs.h mar_gen.h swab.h 	\
 
 CS_INTERNAL_H		= ipc_cfg.h ipc_cpg.h ipc_evs.h ipc_pload.h ipc_quorum.h 	\
 			jhash.h pload.h quorum.h sq.h ipc_votequorum.h ipc_cmap.h \
-			logsys.h coroapi.h
+			logsys.h coroapi.h icmap.h
 
 LCR_H			= lcr_ckpt.h lcr_comp.h	lcr_ifact.h
 
-ENGINE_H		= config.h quorum.h icmap.h
+ENGINE_H		= config.h quorum.h
 
 TOTEM_H			= totem.h totemip.h totempg.h
 

services/cfg.c

@@ -61,7 +61,7 @@
 #include <corosync/lcr/lcr_comp.h>
 #include <corosync/logsys.h>
 #include <corosync/coroapi.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 #include <corosync/corodefs.h>
 
 LOGSYS_DECLARE_SUBSYS ("CFG");

services/cmap.c

@@ -54,7 +54,7 @@
 #include <corosync/lcr/lcr_comp.h>
 #include <corosync/logsys.h>
 #include <corosync/coroapi.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #define hdb_error_to_cs(_result_) qb_to_cs_error(_result_)
 

services/mon.c

@@ -45,7 +45,7 @@
 #include <corosync/coroapi.h>
 #include <corosync/list.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 #include "../exec/fsm.h"
 
 

services/testquorum.c

@@ -58,7 +58,7 @@
 #include <qb/qbipc_common.h>
 #include <corosync/corodefs.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 
 #include <corosync/mar_gen.h>
 #include <corosync/lcr/lcr_comp.h>

services/votequorum.c

@@ -69,7 +69,7 @@
 #include <corosync/mar_gen.h>
 #include <corosync/coroapi.h>
 #include <corosync/engine/quorum.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 #include <corosync/ipc_votequorum.h>
 
 #define VOTEQUORUM_MAJOR_VERSION 7

services/wd.c

@@ -47,7 +47,7 @@
 #include <corosync/coroapi.h>
 #include <corosync/list.h>
 #include <corosync/logsys.h>
-#include <corosync/engine/icmap.h>
+#include <corosync/icmap.h>
 #include "../exec/fsm.h"