[Ocfs2-commits] mfasheh commits r2711 - trunk/vendor/suse

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu Dec 1 16:14:33 CST 2005 

Author: mfasheh
Signed-off-by: jlbec
Date: 2005-12-01 16:14:32 -0600 (Thu, 01 Dec 2005)
New Revision: 2711

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

Signed-off-by: jlbec



Modified: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2005-11-22 23:34:38 UTC (rev 2710)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2005-12-01 22:14:32 UTC (rev 2711)
@@ -276,7 +276,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -294,7 +299,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -312,7 +322,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -330,7 +345,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -348,7 +368,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -366,7 +391,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -384,7 +414,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -402,7 +437,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -420,7 +460,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -438,7 +483,12 @@
 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/"
 rm "${EXTRA_MODLIB}"/*.ko
@@ -552,5 +602,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

More information about the Ocfs2-commits mailing list