[Ocfs2-commits] mfasheh commits r2713 - branches/ocfs2-1.0/vendor/suse

[svn-commits at oss.oracle.com]

Author: mfasheh
Signed-off-by: jlbec
Date: 2005-12-01 16:15:58 -0600 (Thu, 01 Dec 2005)
New Revision: 2713

Modified:
   branches/ocfs2-1.0/vendor/suse/ocfs2-2.6.5.spec-generic.in
Log:
* Backport r2711 from trunk:
  - Fix the sles9 spec file to put modules in the right place.

* Add debugfs to the sles9 spec file.

Signed-off-by: jlbec



Modified: branches/ocfs2-1.0/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- branches/ocfs2-1.0/vendor/suse/ocfs2-2.6.5.spec-generic.in	2005-12-01 22:15:38 UTC (rev 2712)
+++ branches/ocfs2-1.0/vendor/suse/ocfs2-2.6.5.spec-generic.in	2005-12-01 22:15:58 UTC (rev 2713)
@@ -276,9 +276,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -294,9 +301,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -312,9 +326,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -330,9 +351,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -348,9 +376,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -366,9 +401,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -384,9 +426,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -402,9 +451,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -420,9 +476,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -438,9 +501,16 @@
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/extra"
 INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/kernel"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
+mv "${EXTRA_MODLIB}"/ocfs2_nodemanager.ko "${INST_MODLIB}/fs/ocfs2/cluster/"
+mkdir -p "${INST_MODLIB}/fs/ocfs2/dlm"
+mv "${EXTRA_MODLIB}"/ocfs2_dlm.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
+mv "${EXTRA_MODLIB}"/ocfs2_dlmfs.ko "${INST_MODLIB}/fs/ocfs2/dlm/"
 mkdir -p "${INST_MODLIB}/fs/configfs"
 mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
 rm "${EXTRA_MODLIB}"/*.ko
 
 make clean
@@ -552,5 +622,8 @@
 
 
 %changelog
+* Tue Nov 29 2005 Mark Fasheh <mark.fasheh at oracle.com>
+- Change %build to put modules in fs/ocfs2/cluster and fs/ocfs2/dlm
+
 * Mon Sep 13 2004 Manish Singh <manish.singh at oracle.com>
 - Initial rpm spec file