[Ocfs2-commits] jlbec commits r2914 - branches/ocfs2-1.2/vendor/sles9

svn-commits@oss.oracle.com svn-commits at oss.oracle.com
Thu May 11 16:01:38 CDT 2006


Author: jlbec
Signed-off-by: mfasheh
Date: 2006-05-11 16:01:37 -0500 (Thu, 11 May 2006)
New Revision: 2914

Modified:
   branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
Log:

o Put SLES9 modules in the /lib/modules/<version> directory.  This
  allows us to build RPMs that cleanly apply on top of SLES9 kernels.

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2006-05-04 18:51:07 UTC (rev 2913)
+++ branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2006-05-11 21:01:37 UTC (rev 2914)
@@ -293,7 +293,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -316,7 +316,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -339,7 +339,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -362,7 +362,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -385,7 +385,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -408,7 +408,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -431,7 +431,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -454,7 +454,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -477,7 +477,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -500,7 +500,7 @@
 
 # 2.6 kbuild can't do this install nicely
 EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/kernel"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/updates"
 mkdir -p "${INST_MODLIB}/fs/ocfs2"
 mv "${EXTRA_MODLIB}"/ocfs2.ko "${INST_MODLIB}/fs/ocfs2/"
 mkdir -p "${INST_MODLIB}/fs/ocfs2/cluster"
@@ -526,7 +526,7 @@
 
 %files default
 %defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/fs
+/lib/modules/%{kver}-default/updates/fs
 %endif
 
 
@@ -536,7 +536,7 @@
 
 %files smp
 %defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/fs
+/lib/modules/%{kver}-smp/updates/fs
 %endif
 
 
@@ -546,7 +546,7 @@
 
 %files bigsmp
 %defattr(-,root,root)
-/lib/modules/%{kver}-bigsmp/kernel/fs
+/lib/modules/%{kver}-bigsmp/updates/fs
 %endif
 
 
@@ -556,7 +556,7 @@
 
 %files 64k-pagesize
 %defattr(-,root,root)
-/lib/modules/%{kver}-64k-pagesize/kernel/fs
+/lib/modules/%{kver}-64k-pagesize/updates/fs
 %endif
 
 
@@ -566,7 +566,7 @@
 
 %files sn2
 %defattr(-,root,root)
-/lib/modules/%{kver}-sn2/kernel/fs
+/lib/modules/%{kver}-sn2/updates/fs
 %endif
 
 
@@ -576,7 +576,7 @@
 
 %files iseries64
 %defattr(-,root,root)
-/lib/modules/%{kver}-iseries64/kernel/fs
+/lib/modules/%{kver}-iseries64/updates/fs
 %endif
 
 
@@ -586,7 +586,7 @@
 
 %files pmac64
 %defattr(-,root,root)
-/lib/modules/%{kver}-pmac64/kernel/fs
+/lib/modules/%{kver}-pmac64/updates/fs
 %endif
 
 
@@ -596,7 +596,7 @@
 
 %files pseries64
 %defattr(-,root,root)
-/lib/modules/%{kver}-pseries64/kernel/fs
+/lib/modules/%{kver}-pseries64/updates/fs
 %endif
 
 
@@ -606,7 +606,7 @@
 
 %files s390
 %defattr(-,root,root)
-/lib/modules/%{kver}-s390/kernel/fs
+/lib/modules/%{kver}-s390/updates/fs
 %endif
 
 
@@ -616,7 +616,7 @@
 
 %files s390x
 %defattr(-,root,root)
-/lib/modules/%{kver}-s390x/kernel/fs
+/lib/modules/%{kver}-s390x/updates/fs
 %endif
 
 




More information about the Ocfs2-commits mailing list