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

[Cluster-devel] [PATCH 001/008] configure makefile cleanup



gfs and gfs-kernel do not build anylonger from HEAD. gfs-kernel requires
dlm that's not built and gfs requires iddev that's not part of this branch
anymore.

dlm needs to build before group. The latter requires to link with dlm.

enter group in distclean and add a distclean target for group/Makefile.

don't configure cmirror since we do not build it (Or perhaps fix the Makefile?).

gfs2 is on the way to be merged upstream. gnbd should probably do the same and
already part of the ubuntu kernel tree. So stop building it from here.

fix clean/make target in gfs-kernel since gulm is long way gone.

diff -urNad redhat-cluster-suite-2.20060628~/Makefile redhat-cluster-suite-2.20060628/Makefile
--- redhat-cluster-suite-2.20060628~/Makefile	2006-06-28 13:07:30.000000000 +0200
+++ redhat-cluster-suite-2.20060628/Makefile	2006-06-28 13:07:31.000000000 +0200
@@ -16,28 +16,28 @@
 
 
 all:
-	cd gnbd-kernel && ${MAKE}
+#	cd gnbd-kernel && ${MAKE}
 	cd cman/lib && ${MAKE}
 	cd ccs && ${MAKE}
 	cd cman && ${MAKE}
-	cd group && ${MAKE}
 	cd dlm && ${MAKE}
+	cd group && ${MAKE}
 	cd fence && ${MAKE}
-	cd gfs-kernel && ${MAKE}
-	cd gfs && ${MAKE}
+#	cd gfs-kernel && ${MAKE}
+#	cd gfs && ${MAKE}
 	cd gfs2 && ${MAKE}
 	cd gnbd && ${MAKE}
 	cd rgmanager && ${MAKE}
 #	cd cmirror && ${MAKE}
 
 copytobin:
-	cd gfs-kernel && ${MAKE} copytobin
-	cd gnbd-kernel && ${MAKE} copytobin
+#	cd gfs-kernel && ${MAKE} copytobin
+#	cd gnbd-kernel && ${MAKE} copytobin
 	cd ccs && ${MAKE} copytobin
 	cd cman && ${MAKE} copytobin
 	cd dlm && ${MAKE} copytobin
 	cd fence && ${MAKE} copytobin
-	cd gfs && ${MAKE} copytobin
+#	cd gfs && ${MAKE} copytobin
 	cd gfs2 && ${MAKE} copytobin
 	cd gnbd && ${MAKE} copytobin
 	cd rgmanager && ${MAKE} copytobin
@@ -46,67 +46,68 @@
 clean:
 	rm -f *tar.gz
 	rm -rf build
-	cd gfs-kernel && ${MAKE} clean
-	cd gnbd-kernel && ${MAKE} clean
+#	cd gfs-kernel && ${MAKE} clean
+#	cd gnbd-kernel && ${MAKE} clean
 	cd ccs && ${MAKE} clean
 	cd cman && ${MAKE} clean
 	cd group && ${MAKE} clean
 	cd dlm && ${MAKE} clean
 	cd fence && ${MAKE} clean
-	cd gfs && ${MAKE} clean
+#	cd gfs && ${MAKE} clean
 	cd gfs2 && ${MAKE} clean
 	cd gnbd && ${MAKE} clean
 	cd rgmanager && ${MAKE} clean
 #	cd cmirror && ${MAKE} clean
 
 distclean:
-	cd gfs-kernel && ${MAKE} distclean
-	cd gnbd-kernel && ${MAKE} distclean
+#	cd gfs-kernel && ${MAKE} distclean
+#	cd gnbd-kernel && ${MAKE} distclean
 	cd ccs && ${MAKE} distclean
 	cd cman && ${MAKE} distclean
+	cd group && ${MAKE} distclean
 	cd dlm && ${MAKE} distclean
 	cd fence && ${MAKE} distclean
-	cd gfs && ${MAKE} distclean
+#	cd gfs && ${MAKE} distclean
 	cd gfs2 && ${MAKE} distclean
 	cd gnbd && ${MAKE} distclean
 	cd rgmanager && ${MAKE} distclean
 #	cd cmirror && ${MAKE} distclean
 
 install:
-	cd gfs-kernel && ${MAKE} install
-	cd gnbd-kernel && ${MAKE} install
+#	cd gfs-kernel && ${MAKE} install
+#	cd gnbd-kernel && ${MAKE} install
 	cd ccs && ${MAKE} install
 	cd cman && ${MAKE} install
 	cd group && ${MAKE} install
 	cd dlm && ${MAKE} install
 	cd fence && ${MAKE} install
-	cd gfs && ${MAKE} install
+#	cd gfs && ${MAKE} install
 	cd gfs2 && ${MAKE} install
 	cd gnbd && ${MAKE} install
 	cd rgmanager && ${MAKE} install
 #	cd cmirror && ${MAKE} install
 
 uninstall:
-	cd gfs-kernel && ${MAKE} uninstall
-	cd gnbd-kernel && ${MAKE} uninstall
+#	cd gfs-kernel && ${MAKE} uninstall
+#	cd gnbd-kernel && ${MAKE} uninstall
 	cd ccs && ${MAKE} uninstall
 	cd cman && ${MAKE} uninstall
 	cd dlm && ${MAKE} uninstall
 	cd fence && ${MAKE} uninstall
-	cd gfs && ${MAKE} uninstall
+#	cd gfs && ${MAKE} uninstall
 	cd gfs2 && ${MAKE} uninstall
 	cd gnbd && ${MAKE} uninstall
 	cd rgmanager && ${MAKE} uninstall
 #	cd cmirror && ${MAKE} uninstall
 
 latest_tags:
-	${LATEST_TAG} gfs-kernel
-	${LATEST_TAG} gnbd-kernel
+#	${LATEST_TAG} gfs-kernel
+#	${LATEST_TAG} gnbd-kernel
 	${LATEST_TAG} ccs
 	${LATEST_TAG} cman
 	${LATEST_TAG} dlm
 	${LATEST_TAG} fence
-	${LATEST_TAG} gfs
+#	${LATEST_TAG} gfs
 	${LATEST_TAG} gfs2
 	${LATEST_TAG} gnbd
 	${LATEST_TAG} rgmanager
@@ -122,13 +123,13 @@
 	$(BUILD_SRPMS)
 
 tarballs: TAG
-	make -s COMPONENT=gfs-kernel RELEASE_FILE=gfs-kernel/make/release.mk.input tarball
-	make -s COMPONENT=gnbd-kernel RELEASE_FILE=gnbd-kernel/make/release.mk.input tarball
+#	make -s COMPONENT=gfs-kernel RELEASE_FILE=gfs-kernel/make/release.mk.input tarball
+#	make -s COMPONENT=gnbd-kernel RELEASE_FILE=gnbd-kernel/make/release.mk.input tarball
 	make -s COMPONENT=ccs RELEASE_FILE=ccs/make/release.mk.input tarball
 	make -s COMPONENT=cman RELEASE_FILE=cman/make/release.mk.input tarball
 	make -s COMPONENT=dlm RELEASE_FILE=dlm/make/release.mk.input tarball
 	make -s COMPONENT=fence RELEASE_FILE=fence/make/release.mk.input tarball
-	make -s COMPONENT=gfs RELEASE_FILE=gfs/make/release.mk.input tarball
+#	make -s COMPONENT=gfs RELEASE_FILE=gfs/make/release.mk.input tarball
 	make -s COMPONENT=gfs2 RELEASE_FILE=gfs2/make/release.mk.input tarball
 	make -s COMPONENT=gnbd RELEASE_FILE=gnbd/make/release.mk.input tarball
 	make -s COMPONENT=rgmanager RELEASE_FILE=rgmanager/make/release.mk.input tarball
diff -urNad redhat-cluster-suite-2.20060628~/configure redhat-cluster-suite-2.20060628/configure
--- redhat-cluster-suite-2.20060628~/configure	2006-06-28 13:07:30.000000000 +0200
+++ redhat-cluster-suite-2.20060628/configure	2006-06-28 13:07:31.000000000 +0200
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-echo "configure gnbd-kernel"
-(cd gnbd-kernel; ./configure $@)
+#echo "configure gnbd-kernel"
+#(cd gnbd-kernel; ./configure $@)
 
 echo "configure ccs"
 (cd ccs; ./configure $@)
@@ -18,11 +18,11 @@
 echo "configure fence"
 (cd fence; ./configure $@ -ccslibdir=`pwd`/../ccs/lib --ccsincdir=`pwd`/../ccs/lib --cmanincdir=`pwd`/../cman/lib)
 
-echo "configure gfs-kernel"
-(cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
+#echo "configure gfs-kernel"
+#(cd gfs-kernel; ./configure $@ --dlmkincdir=`pwd`/../dlm-kernel/src2)
 
-echo "configure gfs"
-(cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs --iddevlibdir=`pwd`/../iddev/lib --iddevincdir=`pwd`/../iddev/lib)
+#echo "configure gfs"
+#(cd gfs; ./configure $@ --gfskincdir=`pwd`/../gfs-kernel/src/gfs --iddevlibdir=`pwd`/../iddev/lib --iddevincdir=`pwd`/../iddev/lib)
 
 echo "configure gfs2"
 (cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2 --iddevlibdir=`pwd`/../iddev/lib --iddevincdir=`pwd`/../iddev/lib)
@@ -33,5 +33,5 @@
 echo "configure rgmanager"
 (cd rgmanager; ./configure $@) 
 
-echo "configure cmirror"
-(cd cmirror; ./configure $@)
+#echo "configure cmirror"
+#(cd cmirror; ./configure $@)
diff -urNad redhat-cluster-suite-2.20060628~/gfs-kernel/src/Makefile redhat-cluster-suite-2.20060628/gfs-kernel/src/Makefile
--- redhat-cluster-suite-2.20060628~/gfs-kernel/src/Makefile	2006-02-16 09:29:34.000000000 +0100
+++ redhat-cluster-suite-2.20060628/gfs-kernel/src/Makefile	2006-06-28 13:07:48.000000000 +0200
@@ -14,32 +14,25 @@
 all:
 	cd nolock && ${MAKE} all
 	cd dlm && ${MAKE} all
-	cd gulm && ${MAKE} all
 	cd gfs && ${MAKE} all
 
 install:
 	cd nolock && ${MAKE} install
 	cd dlm && ${MAKE} install
-	cd gulm && ${MAKE} install
 	cd gfs && ${MAKE} install
 
 uninstall:
 	cd nolock && ${MAKE} uninstall
 	cd dlm && ${MAKE} uninstall
-	cd gulm && ${MAKE} uninstall
 	cd gfs && ${MAKE} uninstall
 
 clean:
 	rm -rf *.patch linux-patched
 	cd nolock && ${MAKE} clean
 	cd dlm && ${MAKE} clean
-	cd gulm && ${MAKE} clean
 	cd gfs && ${MAKE} clean
 
 patches:
 	cd gfs && ${MAKE} patches
 	cd nolock && ${MAKE} patches
 	cd dlm && ${MAKE} patches
-	cd gulm && ${MAKE} patches
-
-
diff -urNad redhat-cluster-suite-2.20060628~/group/Makefile redhat-cluster-suite-2.20060628/group/Makefile
--- redhat-cluster-suite-2.20060628~/group/Makefile	2006-06-28 13:07:30.000000000 +0200
+++ redhat-cluster-suite-2.20060628/group/Makefile	2006-06-28 13:07:31.000000000 +0200
@@ -31,3 +31,5 @@
 	cd dlm_controld && ${MAKE} install
 	cd gfs_controld && ${MAKE} install
 
+distclean: clean
+	rm -f make/defines.mk


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