[Ocfs2-commits] jlbec commits r1811 - in trunk: . fs fs/usysfs

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-20 17:02:13 -0600 (Thu, 20 Jan 2005)
New Revision: 1811

Modified:
   trunk/Makefile
   trunk/fs/Makefile
   trunk/fs/usysfs/Makefile
Log:

Step 4 - Make usysfs work

o Updated the Makefiles so usysfs now builds under fs/usysfs.  It's
  still 2.6-only, as I don't have 2.4 compat yet.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-20 22:52:40 UTC (rev 1810)
+++ trunk/Makefile	2005-01-20 23:02:13 UTC (rev 1811)
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/Preamble.make
 
-SUBDIRS = usysfs cluster fs docs patches vendor
+SUBDIRS = cluster fs docs patches vendor
 
 DIST_FILES = \
 	COPYING		\

Modified: trunk/fs/Makefile
===================================================================
--- trunk/fs/Makefile	2005-01-20 22:52:40 UTC (rev 1810)
+++ trunk/fs/Makefile	2005-01-20 23:02:13 UTC (rev 1811)
@@ -16,7 +16,7 @@
 # As 2.6 kbuild is unhappy seeing SUBDIRS, this is a safe one to
 # set globally.  Do not include trailing slashes.
 #
-SAFE_SUBDIRS := ocfs2
+SAFE_SUBDIRS := usysfs ocfs2
 
 ifneq ($(KERNELRELEASE),)
 #
@@ -57,7 +57,10 @@
 # This is a 2.4 kernel.  Let Makebo handle recursion.
 #
 
-SUBDIRS = $(SAFE_SUBDIRS)
+# WARNING WARNING WARNING HACK HACK HACK
+# 2.4 doesn't build usysfs yet
+#SUBDIRS = $(SAFE_SUBDIRS)
+SUBDIRS = $(filter-out usysfs,$(SAFE_SUBDIRS))
 
 endif
 

Modified: trunk/fs/usysfs/Makefile
===================================================================
--- trunk/fs/usysfs/Makefile	2005-01-20 22:52:40 UTC (rev 1810)
+++ trunk/fs/usysfs/Makefile	2005-01-20 23:02:13 UTC (rev 1811)
@@ -6,9 +6,9 @@
 else
 # We are included by kbuild, and the is pre-"Kbuild"-files.
 
-USYSFS_SRC_DIR	:= $(M)
+OUR_TOPDIR	:= $(M)/..
 
-include $(USYSFS_SRC_DIR)/../Config.make
+include $(OUR_TOPDIR)/Config.make
 endif
 
 ifeq ($(KERNELRELEASE),)
@@ -66,5 +66,5 @@
 # Called from kbuild in a kernel that predates Kbuild files.
 #
 
-include $(USYSFS_SRC_DIR)/Kbuild
+include $(OUR_TOPDIR)/fs/usysfs/Kbuild
 endif