[Ocfs2-commits] manish commits r1139 - in trunk: . src

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu Jun 17 21:59:14 CDT 2004 

Author: manish
Date: 2004-06-17 20:59:13 -0500 (Thu, 17 Jun 2004)
New Revision: 1139

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/src/Makefile
Log:
Clean up build framework
memdebug gone, USE_JOURNAL_CREATE_REPLACEMENT grokked from kernel versions
in ocfs_compat.h.
2.4 stuff isolated further


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2004-06-18 01:51:16 UTC (rev 1138)
+++ trunk/Config.make.in	2004-06-18 01:59:13 UTC (rev 1139)
@@ -59,8 +59,5 @@
 OCFS_DEBUG = @OCFS_DEBUG@
 OCFS_LARGEIO = @OCFS_LARGEIO@
 OCFS_AIO = @OCFS_AIO@
-OCFS_MEMDEBUG = @OCFS_MEMDEBUG@
 OCFS_TRACE = @OCFS_TRACE@
 OCFS_PROCESSOR = @OCFS_PROCESSOR@
-
-USE_JOURNAL_CREATE_REPLACEMENT = @USE_JOURNAL_CREATE_REPLACEMENT@

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-06-18 01:51:16 UTC (rev 1138)
+++ trunk/configure.in	2004-06-18 01:59:13 UTC (rev 1139)
@@ -101,15 +101,6 @@
 AC_SUBST(OCFS_AIO)
 AC_MSG_RESULT($enable_aio)
 
-AC_MSG_CHECKING(for memory debugging)
-AC_ARG_ENABLE(memdebug, [  --enable-memdebug=[yes/no]     Turn on memory debugging [default=no]],,enable_memdebug=no)
-OCFS_MEMDEBUG=
-if test "x$enable_memdebug" = "xyes"; then
-  OCFS_MEMDEBUG=yes
-fi
-AC_SUBST(OCFS_MEMDEBUG)
-AC_MSG_RESULT($enable_memdebug)
-
 AC_MSG_CHECKING(for tracing)
 AC_ARG_ENABLE(trace, [  --enable-trace=[yes/no]         Turn on tracing [default=yes]],,enable_trace=yes)
 OCFS_TRACE=
@@ -264,27 +255,6 @@
 fi
 AC_SUBST(HAVE_NPTL)
 
-AC_MSG_CHECKING([for buggy journal_create function])
-
-if test "x$rhkernel" = "xyes"; then
-  journal_min_version="2.4.2[[1-9]]*"
-else
-  journal_min_version="2.4.2[[2-9]]*"
-fi
-
-USE_JOURNAL_CREATE_REPLACEMENT=yes
-case "$kversion" in
-  $journal_min_version)
-    USE_JOURNAL_CREATE_REPLACEMENT=no
-    ;;
-  2.6.*)
-    USE_JOURNAL_CREATE_REPLACEMENT=no
-    ;;
-esac
-
-AC_MSG_RESULT($USE_JOURNAL_CREATE_REPLACEMENT)
-AC_SUBST(USE_JOURNAL_CREATE_REPLACEMENT)
-
 AC_MSG_CHECKING([for kernel module symbol versions])
 AC_EGREP_CPP(kernel_has_modversions,
 [#include <linux/autoconf.h>

Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-06-18 01:51:16 UTC (rev 1138)
+++ trunk/src/Makefile	2004-06-18 01:59:13 UTC (rev 1139)
@@ -8,7 +8,7 @@
 # We are being included by the 2.6.x kernel build system
 
 # Global parameter so we know where our stuff is
-OCFS_SRC_DIR	:= $(SUBDIRS)
+OCFS_SRC_DIR	:= $(M)
 
 include $(OCFS_SRC_DIR)/../Config.make
 endif
@@ -16,23 +16,16 @@
 #-*******************************************************
 # Now do stuff which is global for 2.4.x and 2.6.x builds
 
-WARNINGS = -Wall -Wstrict-prototypes
-
 ifdef OCFS_DEBUG
 OPTS += -g
 endif
 
-BASE_DEFINES = -DMODULE -DLINUX -D__KERNEL__ 
 GLOBAL_DEFINES =
 
 ifdef OCFS_DEBUG
 GLOBAL_DEFINES += -DDEBUG
 endif
 
-ifdef OCFS_MEMDEBUG
-GLOBAL_DEFINES += -DOCFS_LINUX_MEM_DEBUG -DDEBUG_SLAB_ALLOCS
-endif
-
 ifdef OCFS_AIO
 GLOBAL_DEFINES += -DAIO_ENABLED
 endif
@@ -45,10 +38,6 @@
 GLOBAL_DEFINES += -DHAVE_NPTL
 endif
 
-ifeq ($(USE_JOURNAL_CREATE_REPLACEMENT),yes)
-GLOBAL_DEFINES += -DUSE_JOURNAL_CREATE_REPLACEMENT
-endif
-
 ifneq ($(QUIET),1)
 GLOBAL_DEFINES += -DDEBUG_LOCK_BUFFER
 GLOBAL_DEFINES += -DVERBOSE_BH_JBD_TRACE
@@ -62,59 +51,6 @@
 
 endif
 
-ifeq ($(KVER),vmware)
-  KERNELINC = /usr/src/linux-2.4/include
-endif
-
-ifeq ($(KVER),suse)
-GLOBAL_DEFINES += -DSUSE
-endif
-ifeq ($(KVER),hugemem)
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=1
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=0
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=0
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=0
-endif
-ifeq ($(KVER),smp)
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=0
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=0 
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=1 
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=0 
-endif
-ifeq ($(KVER),ent)
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=0
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=1 
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=0 
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=0 
-endif
-ifeq ($(KVER),up)
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=0
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=0 
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=0 
-  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=1 
-endif
-
-ifeq ($(OCFS_PROCESSOR),ppc64)
-  MACH_CFLAGS += -m64 -fsigned-char -fno-builtin -msoft-float -mminimal-toc
-  LDADD += -m elf64ppc
-endif
-ifeq ($(OCFS_PROCESSOR),x86_64)
-  MACH_CFLAGS += -m64 -mcmodel=kernel
-endif
-ifeq ($(OCFS_PROCESSOR),ia64)
-endif
-ifeq ($(OCFS_PROCESSOR),i686)
-  GLOBAL_DEFINES += -D__ILP32__
-endif
-ifeq ($(OCFS_PROCESSOR),i586)
-  GLOBAL_DEFINES += -D__ILP32__
-endif
-ifeq ($(OCFS_PROCESSOR),s390x)
-  GLOBAL_DEFINES += -D__LP64__
-endif
-
-DEFINES += $(BASE_DEFINES) $(GLOBAL_DEFINES)
-
 CFILES =			\
 	alloc.c			\
 	bitmap.c		\
@@ -171,6 +107,9 @@
 	volcfg.h		\
 	vote.h
 
+VERSION_FILES = $(CFILES) $(HFILES)
+VERSION_PREFIX = OCFS
+
 OBJS = $(subst .c,.o,$(CFILES))
 
 # End of stuff which is global for 2.4.x and 2.6.x kernels
@@ -184,13 +123,55 @@
 ifndef KERNEL_26
 # Building for a 2.4.x kernel
 
-# Make dependancies work
-$(OBJS): $(HFILES)
+WARNINGS = -Wall -Wstrict-prototypes
 
 ifneq ($(OCFS_PROCESSOR),x86_64)
 WARNINGS += -Wmissing-prototypes -Wmissing-declarations
 endif
 
+ifeq ($(KVER),vmware)
+  KERNELINC = /usr/src/linux-2.4/include
+endif
+
+ifeq ($(KVER),suse)
+  GLOBAL_DEFINES += -DSUSE
+endif
+ifeq ($(KVER),hugemem)
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=1
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=0
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=0
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=0
+endif
+ifeq ($(KVER),smp)
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=0
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=0 
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=1 
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=0 
+endif
+ifeq ($(KVER),ent)
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=0
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=1 
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=0 
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=0 
+endif
+ifeq ($(KVER),up)
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_HUGEMEM=0
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_ENTERPRISE=0 
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_SMP=0 
+  GLOBAL_DEFINES += -D__BOOT_KERNEL_UP=1 
+endif
+
+ifeq ($(OCFS_PROCESSOR),ppc64)
+  MACH_CFLAGS += -m64 -fsigned-char -fno-builtin -msoft-float -mminimal-toc
+  LDADD += -m elf64ppc
+endif
+ifeq ($(OCFS_PROCESSOR),x86_64)
+  MACH_CFLAGS += -m64 -mcmodel=kernel
+endif
+
+BASE_DEFINES = -DMODULE -DLINUX -D__KERNEL__ 
+DEFINES += $(BASE_DEFINES) $(GLOBAL_DEFINES)
+
 INCLUDES = -I. -I$(KERNELINC) -I$(GCCINC)
 
 CFLAGS = $(OPTS) $(MACH_CFLAGS) -pipe -nostdinc -fno-strict-aliasing \
@@ -205,12 +186,12 @@
 
 INSTALL_MODULE = $(MODULES)
 
-$(CFILES): $(HFILES)
-
-VERSION_FILES = $(CFILES) $(HFILES)
 VERSION_SRC = ver.c
-VERSION_PREFIX = OCFS
 
+# Make dependancies work
+$(CFILES): $(HFILES)
+$(OBJS): $(HFILES)
+
 ocfs2.o: $(OBJS)
 	$(CC) $(OPTS) -Wl,-r -o $@ $^ $(LDADD)
 
@@ -236,7 +217,7 @@
 ALL_RULES = build-modules
 
 build-modules:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(CURDIR) modules
+	$(MAKE) -C $(KDIR) M=$(CURDIR) modules
 
 endif # OCFS_KERNEL_2_6
 
@@ -267,13 +248,8 @@
 # various parameters for the kernel make system and then it will take care of
 # building us.
 
-# EXTRA_CFLAGS += -D__ILP32__ -I$(OCFS_SRC_DIR)/inc -Wno-format
-EXTRA_CFLAGS += -I$(OCFS_SRC_DIR)/inc
+EXTRA_CFLAGS += $(GLOBAL_DEFINES)
 
-EXTRA_CFLAGS += $(GLOBAL_DEFINES) $(WARNINGS)
-
-# FIXME: Need to figure out how to use the stuff from Postamble.make.  In
-# particular the MD5 and Version strings
 EXTRA_CFLAGS +=	-DOCFS_BUILD_DATE=\"y\" -DOCFS_BUILD_MD5=\"z\" \
 		-DOCFS_BUILD_VERSION=\"x\"

More information about the Ocfs2-commits mailing list