[Ocfs2-commits] manish commits r1466 - trunk/vendor/suse

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-13 18:10:31 -0500 (Mon, 13 Sep 2004)
New Revision: 1466

Modified:
   trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
Log:
Fix arch specification, add bigsmp for ia32


Modified: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2004-09-13 22:36:52 UTC (rev 1465)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2004-09-13 23:10:31 UTC (rev 1466)
@@ -12,6 +12,7 @@
 # for future proofing)
 %define builddefault		1
 %define buildsmp		1
+%define buildbigsmp		1
 %define build64kpagesize	0
 %define buildsn2		0
 %define buildiseries64		0
@@ -24,14 +25,17 @@
 %define karch i386
 %endif
 
-%ifarch x86_64
+%ifarch x86_64 ia32e
 %define karch x86_64
+
+%define buildbigsmp		0
 %endif
 
 %ifarch ia64
 %define karch ia64
 
 %define buildsmp		0
+%define buildbigsmp		0
 %define build64kpagesize	1
 %define buildsn2		1
 %endif
@@ -39,6 +43,7 @@
 %ifarch ppc
 %define karch ppc
 
+%define buildbigsmp		0
 %define buildiseries64		1
 %define buildpmac64		1
 %define buildpseries64		1
@@ -49,6 +54,7 @@
 
 %define builddefault		0
 %define buildsmp		0
+%define buildbigsmp		0
 %define builds390		1
 %endif
 
@@ -57,6 +63,7 @@
 
 %define builddefault		0
 %define buildsmp		0
+%define buildbigsmp		0
 %define builds390x		1
 %endif
 
@@ -127,6 +134,22 @@
 %endif
 
 
+%if %{buildbigsmp}
+%package smp
+Summary: The Oracle Cluster File System Version 2 for BigSMP systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: ocfs2 = %{version}
+Requires: kernel-bigsmp = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description bigsmp
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for large memory symmetric multiprocessor kernels.
+%endif
+
+
 %if %{build64kpagesize}
 %package 64k-pagesize
 Summary: The Oracle Cluster File System Version 2 for Itanium 64k pagesize systems.
@@ -246,7 +269,7 @@
 %build
 
 %if %{builddefault}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/default"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/default"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -256,7 +279,7 @@
 %endif
 
 %if %{buildsmp}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/smp"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/smp"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -265,8 +288,18 @@
 cd ..
 %endif
 
+%if %{buildbigsmp}
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/bigsmp"
+%configure --with-kernel="${KPATH}"
+cd src
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/ocfs2" install 
+make clean
+cd ..
+%endif
+
 %if %{build64kpagesize}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/64k-pagesize"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/64k-pagesize"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -276,7 +309,7 @@
 %endif
 
 %if %{buildsn2}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/sn2"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/sn2"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -286,7 +319,7 @@
 %endif
 
 %if %{buildiseries64}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/iseries64"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/iseries64"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -296,7 +329,7 @@
 %endif
 
 %if %{buildpmac64}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/pmac64"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pmac64"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -306,7 +339,7 @@
 %endif
 
 %if %{buildpseries64}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/pseries64"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pseries64"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -316,7 +349,7 @@
 %endif
 
 %if %{builds390}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/s390"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -326,7 +359,7 @@
 %endif
 
 %if %{builds390x}
-KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/s390x"
+KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390x"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -360,6 +393,16 @@
 %endif
 
 
+%if %{buildbigsmp}
+%post bigsmp
+depmod -a
+
+%files bigsmp
+%defattr(-,root,root)
+/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/ocfs2
+%endif
+
+
 %if %{build64kpagesize}
 %post 64k-pagesize
 depmod -a