[Ocfs2-commits] manish commits r2173 - in trunk: . fs

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: mfasheh
Signed-off-by: jlbec
Date: 2005-04-25 19:59:11 -0500 (Mon, 25 Apr 2005)
New Revision: 2173

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/fs/Makefile
Log:
Add --with-xen configure option, which will pass ARCH=xen to the kernel
build.

Signed-off-by: mfasheh
Signed-off-by: jlbec


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-04-26 00:43:42 UTC (rev 2172)
+++ trunk/Config.make.in	2005-04-26 00:59:11 UTC (rev 2173)
@@ -56,6 +56,8 @@
 
 GCCINC = @GCCINC@
 
+ARCH_XEN = @ARCH_XEN@
+
 KVER =
 else
 MAKEBO_VERSION = @VERSION@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-04-26 00:43:42 UTC (rev 2172)
+++ trunk/configure.in	2005-04-26 00:59:11 UTC (rev 2173)
@@ -231,6 +231,17 @@
 KERNELVER=$kversion
 AC_SUBST(KERNELVER)
 
+AC_MSG_CHECKING(for Xen kernel)
+AC_ARG_WITH(xen, [  --with-xen                        Build for Xen kernel [default=no]])
+ARCH_XEN=
+if test "x$with_xen" = "xyes"; then
+  ARCH_XEN="ARCH=xen"
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST(ARCH_XEN)
+
 COMPAT_SAFE_WRITE=
 if test "x$KERNEL_26" != "xyes"; then
   AC_MSG_CHECKING([for safe write ordering])

Modified: trunk/fs/Makefile
===================================================================
--- trunk/fs/Makefile	2005-04-26 00:43:42 UTC (rev 2172)
+++ trunk/fs/Makefile	2005-04-26 00:59:11 UTC (rev 2173)
@@ -51,14 +51,16 @@
 	$(MAKE) -C ocfs2 stamp-md5
 	$(MAKE) -C ocfs2/cluster stamp-md5
 	$(MAKE) -C ocfs2/dlm stamp-md5
-	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
+	$(MAKE) -C $(KERNELDIR) $(ARCH_XEN) M=$(CURDIR) modules
 
 install-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules_install
+	$(MAKE) -C $(KERNELDIR) $(ARCH_XEN) M=$(CURDIR) modules_install
 
 clean-modules:
-	$(MAKE) -C $(KERNELDIR) M=$(CURDIR) clean
+	$(MAKE) -C $(KERNELDIR) $(ARCH_XEN) M=$(CURDIR) clean
 	-rm ocfs2/stamp-md5
+	-rm ocfs2/cluster/stamp-md5
+	-rm ocfs2/dlm/stamp-md5
 else
 #
 # This is a 2.4 kernel.  Let Makebo handle recursion.