[Oracleasm-commits] jlbec commits r385 - trunk/vendor/rhel4

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2008-07-28 12:13:05 -0700 (Mon, 28 Jul 2008)
New Revision: 385

Modified:
   trunk/vendor/rhel4/Vendor.make
   trunk/vendor/rhel4/kernel.guess
   trunk/vendor/rhel4/oracleasm.spec-generic.in
Log:

Pull forward the rhel4 xenU changes origially commited against
oracleasm-2.0.3.



Modified: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make	2008-07-28 19:00:18 UTC (rev 384)
+++ trunk/vendor/rhel4/Vendor.make	2008-07-28 19:13:05 UTC (rev 385)
@@ -10,15 +10,21 @@
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*oracleasm-}"; \
 		SPECVER="$${SPECVER%.spec}"; \
-		LARGEVER="$${SPECVER#2.6.9-}"; \
-		LARGEVER="$${LARGEVER%%.*}"; \
-		if [ "$${LARGEVER}" -lt 34 ]; \
+		SUBVER="$${SPECVER#2.6.9-}"; \
+		SUBVER="$${SUBVER%%.*}"; \
+		if [ "$${SUBVER}" -lt 34 ]; \
 		then \
 			LARGESMP=0; \
 		else \
 			LARGESMP=1; \
 		fi; \
-		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' -e 's/@@LARGESMP@@/'$${LARGESMP}'/' < $< > $@
+		if [ "$${SUBVER}" -lt 55 ]; \
+		then \
+			XENU=0; \
+		else \
+			XENU=1; \
+		fi; \
+		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' -e 's/@@LARGESMP@@/'$${LARGESMP}'/' -e 's/@@XENU@@/'$${XENU}'/' < $< > $@
 
 rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-%.spec
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-$(patsubst rhel4_%_srpm,%,$@).spec

Modified: trunk/vendor/rhel4/kernel.guess
===================================================================
--- trunk/vendor/rhel4/kernel.guess	2008-07-28 19:00:18 UTC (rev 384)
+++ trunk/vendor/rhel4/kernel.guess	2008-07-28 19:13:05 UTC (rev 385)
@@ -17,8 +17,8 @@
 # type.  So, we have TYPES and OLD TYPES.
 #
 RHEL4_KERNEL_TYPES="
-    i686:,smp,hugemem
-    x86_64:,smp,largesmp
+    i686:,smp,hugemem,xenU
+    x86_64:,smp,largesmp,xenU
     ia64:,largesmp
     ppc64:,largesmp
     s390x:
@@ -35,6 +35,9 @@
 guess_rhel4_type()
 {
     case "$1" in
+    *xenU)
+        echo "xenU"
+        ;;
     *largesmp)
         echo "largesmp"
         ;;
@@ -79,6 +82,10 @@
     KVER="$1"
     DIR="$2"
 
+    if [ -z "$KVER" ]
+    then
+        return 1
+    fi
     if [ ! -d "${RHEL4_KERNEL_BASE}/${DIR}" ]
     then
         return 1
@@ -132,12 +139,20 @@
     ARCH="$2"
     TYPELIST="$3"
 
-    # Red Hat introduced the "largesmp" type in 34.EL.  Anything older
-    # can ignore it.
-    LARGESMP="${KVER#2.6.9-}"
-    LARGESMP="${LARGESMP%%.*}"
-    if [ "$LARGESMP" -lt 34 ]
+    SUBVER="${KVER#2.6.9-}"
+    SUBVER="${SUBVER%%.*}"
+
+    # Red Hat introduced the "xenU" type in 55.EL. Anything older can
+    # ignore it.
+    if [ "$SUBVER" -lt 55 ]
     then
+        TYPELIST="${TYPELIST%,xenU}"
+    fi
+
+    # Red Hat introduced the "largesmp" type in 34.EL. Anything older can
+    # ignore it.
+    if [ "$SUBVER" -lt 34 ]
+    then
         TYPELIST="${TYPELIST%,largesmp}"
     fi
 

Modified: trunk/vendor/rhel4/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/rhel4/oracleasm.spec-generic.in	2008-07-28 19:00:18 UTC (rev 384)
+++ trunk/vendor/rhel4/oracleasm.spec-generic.in	2008-07-28 19:13:05 UTC (rev 385)
@@ -13,17 +13,20 @@
 %define buildsmp	0
 %define buildhugemem	0
 %define buildlargesmp	0
+%define buildxenu	0
 
 %ifarch i686
 %define karch		i686
 %define buildsmp	1
 %define buildhugemem	1
+%define buildxenu	@@XENU@@
 %endif
 
 %ifarch x86_64
 %define karch		x86_64
 %define buildsmp	1
 %define buildlargesmp	@@LARGESMP@@
+%define buildxenu	@@XENU@@
 %endif
 
 %ifarch ia32e
@@ -129,8 +132,23 @@
 This package is compiled for large SMP kernels.
 %endif
 
+%if %{buildxenu}
+%package -n oracleasm-%{kver}xenU
+Summary: The Oracle Automatic Storage Management library driver for Xen DomU kernels.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-xenU = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-xenU-devel = %{kver}
 
+%description -n oracleasm-%{kver}xenU
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for Xen DomU kernels.
+%endif
 
+
 %prep
 %setup -n oracleasm-%{version}
 
@@ -217,7 +235,22 @@
 make clean
 %endif
 
+%if %{buildxenu}
+local_configure "%{kver}xenU"
 
+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}xenU/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}xenU/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+
 %install
 
 
@@ -265,8 +298,20 @@
 /lib/modules/%{kver}largesmp/kernel/drivers/addon/oracleasm
 %endif
 
+%if %{buildxenu}
+%post -n oracleasm-%{kver}xenU
+depmod -ae %{kver}xenU
 
+%files -n oracleasm-%{kver}xenU
+%defattr(-,root,root)
+/lib/modules/%{kver}xenU/kernel/drivers/addon/oracleasm
+%endif
+
+
 %changelog
+* Fri Oct 26 2007 Sunil Mushran <sunil.mushran at oracle.com>
+- Add xenU
+
 * Thu May 25 2006 Joel Becker <joel.becker at oracle.com>
 - Add largesmp