[Oracleasm-commits] seeda commits r389 - trunk/vendor/sles10

[svn-commits at oss.oracle.com]

Author: seeda
Date: 2008-10-23 15:11:24 -0700 (Thu, 23 Oct 2008)
New Revision: 389

Modified:
   trunk/vendor/sles10/kernel.guess
   trunk/vendor/sles10/oracleasm.spec-generic.in
Log:
Modified kernel.guess: Made -default as s390x build default
Modified oracleasm.spec-generic.in: Removed s390 sections as it now uses -default



Modified: trunk/vendor/sles10/kernel.guess
===================================================================
--- trunk/vendor/sles10/kernel.guess	2008-10-23 22:09:38 UTC (rev 388)
+++ trunk/vendor/sles10/kernel.guess	2008-10-23 22:11:24 UTC (rev 389)
@@ -16,7 +16,7 @@
     ppc64:pseries64,iseries64,pmac64
     ia64:default,64k-pagesize,sn2
     i386:default,smp,bigsmp
-    s390:s390x
+    s390:default
 "
     
 

Modified: trunk/vendor/sles10/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/sles10/oracleasm.spec-generic.in	2008-10-23 22:09:38 UTC (rev 388)
+++ trunk/vendor/sles10/oracleasm.spec-generic.in	2008-10-23 22:11:24 UTC (rev 389)
@@ -17,8 +17,6 @@
 %define buildiseries64		0
 %define buildpmac64		0
 %define buildpseries64		0
-%define builds390		0
-%define builds390x		0
 
 %ifarch %{ix86}
 %define karch i386
@@ -53,19 +51,15 @@
 %ifarch s390
 %define karch s390
 
-%define builddefault		0
 %define buildsmp		0
 %define buildbigsmp		0
-%define builds390		1
 %endif
 
 %ifarch s390x
 %define karch s390
 
-%define builddefault		0
 %define buildsmp		0
 %define buildbigsmp		0
-%define builds390x		1
 %endif
 
 
@@ -238,41 +232,6 @@
 %endif
 
 
-%if %{builds390}
-%package s390
-Summary: The Oracle Automatic Storage Management library driver for IBM S/390 31-bit systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-s390 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description s390
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM S/390 31-bit systems.
-%endif
-
-
-%if %{builds390x}
-%package s390x
-Summary: The Oracle Automatic Storage Management library driver for IBM zSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-s390x = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description s390x
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM zSeries systems.
-%endif
-
-
-
 %prep
 %setup -n oracleasm-%{version}
 
@@ -411,36 +370,7 @@
 make clean
 %endif
 
-%if %{builds390}
-local_configure "%{kver}-s390"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
-# 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/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{builds390x}
-local_configure "%{kver}-s390x"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 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/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-
-
 %install
 
 
@@ -530,28 +460,11 @@
 %endif
 
 
-%if %{builds390}
-%post s390
-depmod -ae %{kver}-s390
 
-%files s390
-%defattr(-,root,root)
-/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{builds390x}
-%post s390x
-depmod -ae %{kver}-s390x
-
-%files s390x
-%defattr(-,root,root)
-/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm
-%endif
-
-
-
 %changelog
+* Thu Oct 23 2008 Joel Becker <joel.becker at oracle.com>
+- Remove s390 sections, as it now uses -default.
+
 * Tue Sep 21 2004 Joel Becker <joel.becker at oracle.com>
 - Make SLES9 specfile.