[Ocfs2-commits] jlbec commits r1833 - in trunk: . docs fs/ocfs2 fs/ocfs2/cluster fs/usysfs vendor/redhat

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-21 20:09:12 -0600 (Fri, 21 Jan 2005)
New Revision: 1833

Modified:
   trunk/Makefile
   trunk/configure.in
   trunk/docs/Makefile
   trunk/fs/ocfs2/Makefile
   trunk/fs/ocfs2/cluster/Makefile
   trunk/fs/usysfs/Makefile
   trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
Log:

o Fix making grep >/dev/null.
o Make new RHEL3 srpm stuff go.
o Make "make dist" work.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
@@ -9,6 +9,7 @@
 	Config.make.in	\
 	Preamble.make	\
 	Postamble.make	\
+	Kbuild-24.make	\
 	Versioning.make	\
 	config.guess	\
 	config.sub	\
@@ -18,18 +19,9 @@
 	mkinstalldirs
 
 #
-# REDHAT 
-#
-rhel3_srpm: dist
-	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/redhat/ocfs2-2.4.21-EL.spec
-
-rhel3_rpm: rhel3_srpm
-	rpmbuild --rebuild --target i686 "ocfs2-2.4.21-EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
-
-#
 # RHEL3
 #
-$(TOPDIR)/vendor/redhat/ocfs2-2.4.21-%.EL.spec: $(TOPDIR)/vendor/suse/ocfs2-2.4.21-EL.spec-generic
+$(TOPDIR)/vendor/redhat/ocfs2-2.4.21-%.EL.spec: $(TOPDIR)/vendor/redhat/ocfs2-2.4.21-EL.spec-generic
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*ocfs2-2.4.21-}"; \
 		SPECVER="$${SPECVER%.EL.spec}"; \

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/configure.in	2005-01-22 02:09:12 UTC (rev 1833)
@@ -257,7 +257,7 @@
 
 MISSING_SOCK_CREATE_LITE=
 AC_MSG_CHECKING([for sock_create_lite])
-if grep -q "\<sock_create_lite(" "$KERNELINC/linux/net.h" ; then
+if grep "\<sock_create_lite(" "$KERNELINC/linux/net.h" >/dev/null 2>&1 ; then
   AC_MSG_RESULT(yes)
 else
   MISSING_SOCK_CREATE_LITE=yes

Modified: trunk/docs/Makefile
===================================================================
--- trunk/docs/Makefile	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/docs/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
@@ -2,6 +2,6 @@
 
 include $(TOPDIR)/Preamble.make
 
-DIST_FILES = sample-ocfs.conf
+DIST_FILES = 
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/fs/ocfs2/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
@@ -84,6 +84,7 @@
 	ocfs2_fs.h		\
 	ocfs1_fs_compat.h	\
 	ocfs.h			\
+	ocfs2.h			\
 	ocfs_log.h		\
 	ocfs_compat.h		\
 	ocfs_journal.h		\

Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/fs/ocfs2/cluster/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
@@ -39,22 +39,26 @@
 # Called from a regular "make".
 #
 
-SOURCES =		\
-	compat_libfs.c	\
-	heartbeat.c	\
-	nodemanager.c	\
-	tcp.c		\
+SOURCES =			\
+	compat_libfs.c		\
+	heartbeat.c		\
+	nodemanager.c		\
+	tcp.c			\
 	transaction_file.c	\
 	util.c
 
-HEADERS = 		\
-	cl_compat.h	\
-	compat_libfs.h	\
-	heartbeat.h	\
-	nodemanager.h	\
-	tcp.h		\
+HEADERS = 			\
+	clcommon.h		\
+	cl_compat.h		\
+	compat_libfs.h		\
+	heartbeat.h		\
+	nodemanager.h		\
+	ocfs2_heartbeat.h	\
+	ocfs2_nodemanager.h	\
+	ocfs2_tcp.h		\
+	tcp.h			\
 	transaction_file.h	\
-	util.h		\
+	util.h			\
 	warning_hack.h
 
 DIST_FILES = $(SOURCES) $(HEADERS)

Modified: trunk/fs/usysfs/Makefile
===================================================================
--- trunk/fs/usysfs/Makefile	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/fs/usysfs/Makefile	2005-01-22 02:09:12 UTC (rev 1833)
@@ -1,6 +1,6 @@
 
 ifeq ($(KERNELRELEASE),)
-TOPDIR = ..
+TOPDIR = ../..
 
 include $(TOPDIR)/Preamble.make
 else
@@ -22,7 +22,7 @@
 USYSFS_OBJECTS = $(subst .c,.o,$(USYSFS_SOURCES))
 BOBTEST_OBJECTS = $(subst .c,.o,$(BOBTEST_SOURCES))
 
-DIST_FILES = $(USYSFS_SOURCES) $(BOBTEST_SOURCES) $(HEADERS)
+DIST_FILES = $(USYSFS_SOURCES) $(BOBTEST_SOURCES) $(HEADERS) Kbuild
 
 obj-m := usysfs.o bobtest.o
 usysfs-objs := $(USYSFS_OBJECTS)

Modified: trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in	2005-01-22 01:58:21 UTC (rev 1832)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in	2005-01-22 02:09:12 UTC (rev 1833)
@@ -192,7 +192,7 @@
 
 
 %changelog
-* Fri Jan 21 2004 Joel Becker <joel.becker at oracle.com>
+* Fri Jan 21 2005 Joel Becker <joel.becker at oracle.com>
 - Migrate to OCFS2
 
 * Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>