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

Mon Jan 24 12:38:45 CST 2005

Author: jlbec
Date: 2005-01-24 12:38:43 -0600 (Mon, 24 Jan 2005)
New Revision: 1835

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

o Make install work kernel-ish.  Use INSTALL_MOD_DIR inside the
  Makefiles to place a file under the MODLIB path.  This isn't actually
  how 2.6 works, but 2.6 is flaky on this right now.
o Fix Kbuild-24.make to drop files in MODULEDIR/INSTALL_MOD_DIR.
o Write up the happy fun RHEL3 specfile to...work!



Modified: trunk/Kbuild-24.make
===================================================================

--- trunk/Kbuild-24.make	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/Kbuild-24.make	2005-01-24 18:38:43 UTC (rev 1835)
@@ -99,9 +99,9 @@
 build-modules: $(single-used-m) $(multi-used-m)
 
 install-modules: $(obj-m)
-	$(TOPDIR)/mkinstalldirs $(DESTDIR)$(MODULEDIR)/$(INSTALL_DIR)
+	$(TOPDIR)/mkinstalldirs $(DESTDIR)$(MODULEDIR)/$(INSTALL_MOD_DIR)
 	for file in $(obj-m); do \
-	  $(INSTALL_DATA) $$file $(DESTDIR)/$(MODULEDIR)/$(INSTALL_DIR)/$$file; \
+	  $(INSTALL_DATA) $$file $(DESTDIR)$(MODULEDIR)/$(INSTALL_MOD_DIR)/$$file; \
 	done
 
 clean-modules:

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/configure.in	2005-01-24 18:38:43 UTC (rev 1835)
@@ -266,7 +266,7 @@
 AC_SUBST(MISSING_SOCK_CREATE_LITE)
 
 AC_MSG_CHECKING(for directory for kernel modules)
-AC_ARG_WITH(moddir, [  --with-moddir=/path     Path to where modules should be installed [[/lib/modules/<KVER>/fs]]], moddir="$withval", moddir="/lib/modules/$kversion/kernel/fs")
+AC_ARG_WITH(moddir, [  --with-moddir=/path     Path to where modules should be installed [[/lib/modules/<KVER>/kernel]]], moddir="$withval", moddir="/lib/modules/$kversion/kernel")
 AC_MSG_RESULT($moddir)
 
 MODULEDIR=$moddir

Modified: trunk/fs/Makefile
===================================================================
--- trunk/fs/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/fs/Makefile	2005-01-24 18:38:43 UTC (rev 1835)
@@ -24,6 +24,7 @@
 #
 
 obj-m	+= $(addsuffix /,$(SAFE_SUBDIRS))
+INSTALL_MOD_DIR := fs/ocfs2
 
 else
 #

Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/fs/ocfs2/Makefile	2005-01-24 18:38:43 UTC (rev 1835)
@@ -115,6 +115,8 @@
 VERSION_SRC = ver.c
 VERSION_PREFIX = OCFS
 
+INSTALL_MOD_DIR := fs/ocfs2
+
 obj-m := ocfs2.o
 
 ocfs2-objs := $(OBJECTS)
@@ -169,8 +171,6 @@
 
 SUBDIRS = $(SAFE_SUBDIRS)
 
-INSTALL_DIR = ocfs2
-
 include $(TOPDIR)/Kbuild-24.make
 
 endif

Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/fs/ocfs2/cluster/Makefile	2005-01-24 18:38:43 UTC (rev 1835)
@@ -22,6 +22,7 @@
 endif
 endif
 
+INSTALL_MOD_DIR := fs/ocfs2
 
 obj-m := ocfs2_heartbeat.o ocfs2_nodemanager.o ocfs2_tcp.o
 
@@ -87,8 +88,6 @@
 # everything by hand.
 #
 
-INSTALL_DIR = ocfs2
-
 include $(TOPDIR)/Kbuild-24.make
 
 endif

Modified: trunk/fs/ocfs2/dlm/Makefile
===================================================================
--- trunk/fs/ocfs2/dlm/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/fs/ocfs2/dlm/Makefile	2005-01-24 18:38:43 UTC (rev 1835)
@@ -23,6 +23,8 @@
 endif
 endif
 
+INSTALL_MOD_DIR := fs/ocfs2
+
 obj-m := ocfs2_dlm.o ocfs2_dlmfs.o
 
 ocfs2_dlm-objs := dlmmod.o dlmthread.o dlmrecovery.o util.o \
@@ -86,8 +88,6 @@
 # everything by hand.
 #
 
-INSTALL_DIR = ocfs2
-
 include $(TOPDIR)/Kbuild-24.make
 
 endif

Modified: trunk/fs/usysfs/Kbuild
===================================================================
--- trunk/fs/usysfs/Kbuild	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/fs/usysfs/Kbuild	2005-01-24 18:38:43 UTC (rev 1835)
@@ -2,6 +2,8 @@
 # Makefile for the usysfs virtual filesystem
 #
 
+INSTALL_MOD_DIR := fs/usysfs
+
 obj-m		:= usysfs.o bobtest.o
 usysfs-objs	:= inode.o file.o dir.o symlink.o mount.o bin.o
 		   

Modified: trunk/fs/usysfs/Makefile
===================================================================
--- trunk/fs/usysfs/Makefile	2005-01-23 12:12:36 UTC (rev 1834)
+++ trunk/fs/usysfs/Makefile	2005-01-24 18:38:43 UTC (rev 1835)
@@ -24,6 +24,8 @@
 
 DIST_FILES = $(USYSFS_SOURCES) $(BOBTEST_SOURCES) $(HEADERS) Kbuild
 
+INSTALL_MOD_DIR := fs/usysfs
+
 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-23 12:12:36 UTC (rev 1834)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in	2005-01-24 18:38:43 UTC (rev 1835)
@@ -127,25 +127,25 @@
 
 %if %{buildup}
 make KVER=up QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/${kver}/ocfs2" install 
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}/kernel" install 
 make clean
 %endif
 
 %if %{buildsmp}
 make KVER=smp QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}smp/ocfs2" install 
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}smp/kernel" install 
 make clean
 %endif
 
 %if %{buildhugemem}
 make KVER=hugemem QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}hugemem/ocfs2" install 
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}hugemem/kernel" install 
 make clean
 %endif
 
 %if %{builddebug}
 make KVER=debug QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}debug/ocfs2" install 
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}debug/kernel" install 
 make clean
 %endif
 
@@ -160,7 +160,7 @@
 
 %files
 %defattr(-,root,root)
-/lib/modules/%{kver}/ocfs2
+/lib/modules/%{kver}/kernel/fs
 %endif
 
 %if %{buildsmp}
@@ -169,16 +169,16 @@
 
 %files smp
 %defattr(-,root,root)
-/lib/modules/%{kver}smp/ocfs2
+/lib/modules/%{kver}smp/kernel/fs
 %endif
 
 %if %{buildhugemem}
-%post
+%post hugemem
 depmod -a
 
 %files hugemem
 %defattr(-,root,root)
-/lib/modules/%{kver}hugemem/ocfs2
+/lib/modules/%{kver}hugemem/kernel/fs
 %endif
 
 %if %{builddebug}
@@ -187,7 +187,7 @@
 
 %files debug
 %defattr(-,root,root)
-/lib/modules/%{kver}debug/ocfs2
+/lib/modules/%{kver}debug/kernel/fs
 %endif
 
 

