[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] changes for cman to build from installed openais



Patrick,

Here is the latest openais SRPM which can be used to build RPMs that can
then be used as the basis for building cman.

The cman system requires the attached patch.

Regards
-steve
? .Makefile.swo
? openais20060530
? service_cman.lcrso
Index: Makefile
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/Makefile,v
retrieving revision 1.41
diff -r1.41 Makefile
15,16d14
< AISDIR=openais20060530
< AISTAG=trunk
20,22c18,19
< CFLAGS+= -fPIC -g -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
< 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib -DDEBUG \
< 	-I ${AISDIR}/${AISTAG}/exec -L ${AISDIR}/${AISTAG}/exec
---
> CFLAGS+= -fPIC -g -I../../ccs/lib -I${incdir} -I${top_srcdir}/config \
> 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib -DDEBUG -DOPENAIS_EXTERNAL_SERVICE
29c26
< all: ${AISDIR}/${AISTAG}/exec/aisexec ${TARGET}
---
> all: ${TARGET}
34,38c31,32
< service_cman.lcrso: ${CMAN_OBJS} ${AISDIR}/${AISTAG}/exec/aisexec
< 	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
< 	cp ${TARGET} ${AISDIR}/${AISTAG}/exec
< 	rm -f openais
< 	ln -sf ${AISDIR} openais
---
> service_cman.lcrso: ${CMAN_OBJS}
> 	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir}
65,77d58
< # Target to download openAIS
< ${AISDIR}/${AISDIR}.tar.gz:
< 	mkdir -p ${AISDIR}
< 	cd ${AISDIR} && wget http://people.redhat.com/pcaulfie/${AISDIR}.tar.gz
< 
< # Unpack the tarball
< ${AISDIR}/${AISTAG}: ${AISDIR}/${AISDIR}.tar.gz
< 	cd ${AISDIR} && tar -xzf ${AISDIR}.tar.gz
< 	touch ${AISDIR}/${AISTAG}
< 
< ${AISDIR}/${AISTAG}/exec/aisexec: ${AISDIR}/${AISTAG}
< 	cd ${AISDIR}/${AISTAG} && make BUILD_DYNAMIC=1 OPENAIS_BUILD=DEBUG
< 
81,83d61
< 	install ${AISDIR}/${AISTAG}/exec/aisexec ${libexecdir}/cman/
< 	install ${AISDIR}/${AISTAG}/exec/*.lcrso ${libexecdir}/cman/
< 	install ${AISDIR}/${AISTAG}/exec/keygen ${sbindir}/ais-keygen
Index: ais.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/ais.c,v
retrieving revision 1.30
diff -r1.30 ais.c
28,36c28,35
< #include "totemip.h"
< #include "totemconfig.h"
< #include "commands.h"
< #include "totempg.h"
< #include "aispoll.h"
< #include "service.h"
< #include "config.h"
< #include "print.h"
< #include "../lcr/lcr_comp.h"
---
> /* openais headers */
> #include <openais/totem/totemip.h>
> #include <openais/totem/totempg.h>
> #include <openais/totem/aispoll.h>
> #include <openais/service/service.h>
> #include <openais/service/config.h>
> #include <openais/service/swab.h>
> #include <openais/lcr/lcr_comp.h>
38a38
> #include "commands.h"
40d39
< #include "swab.h"
448a448
> printf ("SETTING to cluster name\n");
Index: ais.h
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/ais.h,v
retrieving revision 1.8
diff -r1.8 ais.h
15c15
< #include "totem.h"
---
> #include <openais/totem/totem.h>
Index: barrier.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/barrier.c,v
retrieving revision 1.7
diff -r1.7 barrier.c
34,35c34,35
< #include "totemip.h"
< #include "aispoll.h"
---
> #include <openais/totem/aispoll.h>
> #include <openais/totem/totemip.h>
Index: cmanccs.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/cmanccs.c,v
retrieving revision 1.15
diff -r1.15 cmanccs.c
29c29
< #include "totemip.h"
---
> #include <openais/totem/totemip.h>
Index: cnxman-private.h
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/cnxman-private.h,v
retrieving revision 1.21
diff -r1.21 cnxman-private.h
17,22c17
< #include <totem.h>
< 
< // PJC: Remove this later
< #ifndef INTERFACE_MAX
< #define INTERFACE_MAX 2
< #endif
---
> #include <openais/totem/totem.h>
Index: commands.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/commands.c,v
retrieving revision 1.43
diff -r1.43 commands.c
34,35c34,37
< #include "totemip.h"
< #include "totempg.h"
---
> #include <openais/totem/totemip.h>
> #include <openais/totem/totempg.h>
> #include <openais/totem/aispoll.h>
> #include <openais/service/swab.h>
44,45d45
< #include "aispoll.h"
< #include "swab.h"
Index: config.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/config.c,v
retrieving revision 1.16
diff -r1.16 config.c
16a17
> #include <openais/service/objdb.h>
18d18
< #include "objdb.h"
Index: daemon.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/daemon.c,v
retrieving revision 1.28
diff -r1.28 daemon.c
32c32,34
< #include "aispoll.h"
---
> #include <openais/totem/aispoll.h>
> #include <openais/totem/totemip.h>
> 
34d35
< #include "totemip.h"
Index: logging.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/logging.c,v
retrieving revision 1.11
diff -r1.11 logging.c
24,25c24,25
< #include "print.h"
< #include "totemip.h"
---
> /* openais header */
> #include <openais/service/print.h>

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]