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

[Cluster-devel] cluster ./Makefile cmirror/init.d/cmirror cmir ...



CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	jbrassow sourceware org	2007-08-30 15:49:32

Modified files:
	.              : Makefile 
	cmirror/init.d : cmirror 
	cmirror/src    : Makefile 
	cmirror-kernel/src: Makefile dm-clog-tfr.c dm-clog.c 
	dlm            : Makefile 
Added files:
	cmirror-kernel/src: dm-log.h-copy dm.h-copy 

Log message:
	- Updates to make cmirror compile properly against kernel-devel
	package (which doesn't include dm.h or dm-log.h).

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.24.2.1&r2=1.24.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/init.d/cmirror.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.1&r2=1.1.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror/src/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.3.2.1&r2=1.3.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/dm-log.h-copy.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/dm.h-copy.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.6.1&r2=1.1.6.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/dm-clog-tfr.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.1&r2=1.1.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cmirror-kernel/src/dm-clog.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2.2.1&r2=1.2.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/dlm/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.2&r2=1.7.2.3

--- cluster/Makefile	2007/08/23 20:00:15	1.24.2.1
+++ cluster/Makefile	2007/08/30 15:49:31	1.24.2.2
@@ -28,8 +28,8 @@
 	${MAKE} -C gfs2 all
 	${MAKE} -C gnbd all
 	${MAKE} -C rgmanager all
-	${MAKE} -C cmirror all
 	${MAKE} -C cmirror-kernel all
+	${MAKE} -C cmirror all
 
 clean:
 	rm -f *tar.gz
@@ -45,8 +45,8 @@
 	${MAKE} -C gfs2 clean
 	${MAKE} -C gnbd clean
 	${MAKE} -C rgmanager clean
-	${MAKE} -C cmirror clean
 	${MAKE} -C cmirror-kernel clean
+	${MAKE} -C cmirror clean
 
 distclean:
 #	${MAKE} -C gfs-kernel distclean
@@ -60,14 +60,14 @@
 	${MAKE} -C gfs2 distclean
 	${MAKE} -C gnbd distclean
 	${MAKE} -C rgmanager distclean
-	${MAKE} -C cmirror distclean
 	${MAKE} -C cmirror-kernel distclean
+	${MAKE} -C cmirror distclean
 
-install: all
+install:
 #	${MAKE} -C gfs-kernel install
 #	${MAKE} -C gnbd-kernel install
-	${MAKE} -C ccs install
 	${MAKE} -C cman install
+	${MAKE} -C ccs install
 	${MAKE} -C group install
 	${MAKE} -C dlm install
 	${MAKE} -C fence install
@@ -75,8 +75,8 @@
 	${MAKE} -C gfs2 install
 	${MAKE} -C gnbd install
 	${MAKE} -C rgmanager install
-	${MAKE} -C cmirror install
 	${MAKE} -C cmirror-kernel install
+	${MAKE} -C cmirror install
 
 uninstall:
 #	${MAKE} -C gfs-kernel uninstall
@@ -90,8 +90,8 @@
 	${MAKE} -C gfs2 uninstall
 	${MAKE} -C gnbd uninstall
 	${MAKE} -C rgmanager uninstall
-	${MAKE} -C cmirror uninstall
 	${MAKE} -C cmirror-kernel uninstall
+	${MAKE} -C cmirror uninstall
 
 latest_tags:
 #	${LATEST_TAG} gfs-kernel
--- cluster/cmirror/init.d/Attic/cmirror	2007/08/23 19:57:31	1.1.2.1
+++ cluster/cmirror/init.d/Attic/cmirror	2007/08/30 15:49:31	1.1.2.2
@@ -15,13 +15,14 @@
 {
         echo -n "Loading clustered mirror log module:"
 
-        modprobe dm-log-clustered
+        modprobe dm-log-clustered >& /dev/null
         rtrn=$?
 
         if [ $rtrn -eq 0 ]; then
                 success "startup"
         else
                 failure "startup"
+		echo
 		return $rtrn
         fi
 
--- cluster/cmirror/src/Attic/Makefile	2007/08/23 20:00:23	1.3.2.1
+++ cluster/cmirror/src/Attic/Makefile	2007/08/30 15:49:32	1.3.2.2
@@ -17,15 +17,11 @@
 
 TARGET=clogd
 
-ifneq (${KERNEL_SRC}, )
 TMP_INCLUDE = $(shell if [ -e ${KERNEL_SRC}/include/linux/dm-clog-tfr.h ]; then \
-	echo '-I${KERNEL_SRC}/include'; else \
-	echo ''; fi)
-else
-TMP_INCLUDE = $(shell if [ -e ${incdir}/linux/dm-clog-tfr.h ]; then \
+	echo '-I${KERNEL_SRC}/include'; \
+	elif [ -e ${incdir}/linux/dm-clog-tfr.h ]; then \
 	echo '-I${incdir}'; else \
 	echo ''; fi)
-endif
 
 ifneq (${TMP_INCLUDE}, )
 INCLUDE += ${TMP_INCLUDE} -I.
--- cluster/cmirror-kernel/src/Attic/Makefile	2007/08/23 19:54:57	1.1.6.1
+++ cluster/cmirror-kernel/src/Attic/Makefile	2007/08/30 15:49:32	1.1.6.2
@@ -26,15 +26,20 @@
 EXTRA_CFLAGS += -I$(obj) -Idrivers/md
 
 all:
+	rm -f dm.h dm-log.h
+	if [ ! -e ${KERNEL_SRC}/drivers/md/dm.h ]; then ln -s dm.h-copy dm.h; fi
+	if [ ! -e ${KERNEL_SRC}/drivers/md/dm-log.h ]; then ln -s dm-log.h-copy dm-log.h; fi	
 	${MAKE} -C ${KERNEL_SRC} M=${PWD} modules USING_KBUILD=yes
 
 install: all
 	install -d ${module_dir}/cluster
 	install dm-log-clustered.ko ${module_dir}/cluster
+	install -d ${incdir}/linux
+	install dm-clog-tfr.h ${incdir}/linux
 
 uninstall:
 	${UNINSTALL} dm-log-clustered.ko ${module_dir}/cluster
 
 clean:
-	rm -rf *.ko *.o *.mod.c *~ .*o.cmd .tmp_versions
+	rm -rf dm.h dm-log.h *.ko *.o *.mod.c *~ .*o.cmd .tmp_versions
 
--- cluster/cmirror-kernel/src/dm-clog-tfr.c	2007/08/23 19:54:57	1.1.2.1
+++ cluster/cmirror-kernel/src/dm-clog-tfr.c	2007/08/30 15:49:32	1.1.2.2
@@ -8,9 +8,9 @@
 #include <linux/module.h>
 #include <net/sock.h>
 #include <linux/workqueue.h>
-#include <linux/dm-clog-tfr.h>
 #include <linux/connector.h>
 #include "dm.h"
+#include "dm-clog-tfr.h"
 
 static uint64_t seq = 0;
 
--- cluster/cmirror-kernel/src/dm-clog.c	2007/08/23 19:54:57	1.2.2.1
+++ cluster/cmirror-kernel/src/dm-clog.c	2007/08/30 15:49:32	1.2.2.2
@@ -6,7 +6,7 @@
 
 #include "dm.h"
 #include "dm-log.h"
-#include <linux/dm-clog-tfr.h>
+#include "dm-clog-tfr.h"
 
 struct flush_entry {
 	int type;
--- cluster/dlm/Makefile	2007/08/03 10:29:02	1.7.2.2
+++ cluster/dlm/Makefile	2007/08/30 15:49:32	1.7.2.3
@@ -15,7 +15,7 @@
 	${MAKE} -C lib all
 	${MAKE} -C tool all
 
-install: all
+install:
 	${MAKE} -C lib install
 	${MAKE} -C tool install
 	${MAKE} -C man install


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