[Oracleasm-commits] seeda commits r382 - trunk/vendor/rhel5

[svn-commits at oss.oracle.com]

Author: seeda
Date: 2007-11-20 20:34:06 -0800 (Tue, 20 Nov 2007)
New Revision: 382

Modified:
   trunk/vendor/rhel5/Vendor.make
   trunk/vendor/rhel5/kernel.guess
   trunk/vendor/rhel5/oracleasm.spec-generic.in
Log:
This commit include changes to spec file to enable asmlib kernel driver build for Redhats new kernel flavor, kernel-debug.
Signed-off-by: smushran


Modified: trunk/vendor/rhel5/Vendor.make
===================================================================
--- trunk/vendor/rhel5/Vendor.make	2007-06-15 20:25:12 UTC (rev 381)
+++ trunk/vendor/rhel5/Vendor.make	2007-11-21 04:34:06 UTC (rev 382)
@@ -10,7 +10,15 @@
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*oracleasm-}"; \
 		SPECVER="$${SPECVER%.spec}"; \
-		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
+		SUBVER="$${SPECVER#2.6.18-}"; \
+		SUBVER="$${SUBVER%%.*}"; \
+		if [ "$${SUBVER}" -lt 53 ]; \
+		then \
+			DEBUG=0; \
+		else \
+			DEBUG=1; \
+		fi; \
+		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' -e 's/@@DEBUG@@/'$${DEBUG}'/' < $< > $@
 
 rhel5_%_srpm: dist $(TOPDIR)/vendor/rhel5/oracleasm-%.spec
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel5/oracleasm-$(patsubst rhel5_%_srpm,%,$@).spec

Modified: trunk/vendor/rhel5/kernel.guess
===================================================================
--- trunk/vendor/rhel5/kernel.guess	2007-06-15 20:25:12 UTC (rev 381)
+++ trunk/vendor/rhel5/kernel.guess	2007-11-21 04:34:06 UTC (rev 382)
@@ -17,11 +17,11 @@
 # a very simple type list :-)
 #
 RHEL5_KERNEL_TYPES="
-    i686:,PAE,xen
-    x86_64:,xen
-    ia64:,xen
-    ppc64:
-    s390x:
+    i686:,PAE,xen,debug
+    x86_64:,xen,debug
+    ia64:,xen,debug
+    ppc64:,debug
+    s390x:,debug
 "
 
 
@@ -42,6 +42,9 @@
     *xen)
         echo "xen"
         ;;
+    *debug)
+        echo "debug"
+        ;;
     *)
         echo ""
         ;;
@@ -130,6 +133,15 @@
     ARCH="$2"
     TYPELIST="$3"
 
+    SUBVER="${KVER#2.6.18-}"
+    SUBVER="${SUBVER%%.*}"
+
+    # Red Hat introduced the "debug" type in 53.el5. Anything older can ignore it.
+    if [ $SUBVER -lt 53 ]
+    then
+        TYPELIST="${TYPELIST%,debug}"
+    fi
+
     typelist="${TYPELIST#$ARCH:}"
     while :
     do

Modified: trunk/vendor/rhel5/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/rhel5/oracleasm.spec-generic.in	2007-06-15 20:25:12 UTC (rev 381)
+++ trunk/vendor/rhel5/oracleasm.spec-generic.in	2007-11-21 04:34:06 UTC (rev 382)
@@ -11,29 +11,35 @@
 %define builddef	1
 %define buildpae	0
 %define buildxen	0
+%define builddebug	0
 
 %ifarch i686
 %define karch		i686
 %define buildpae	1
 %define buildxen	1
+%define builddebug	@@DEBUG@@
 %endif
 
 %ifarch x86_64
 %define karch		x86_64
 %define buildxen	1
+%define builddebug	@@DEBUG@@
 %endif
 
 %ifarch ia64
 %define karch		ia64
 %define buildxen	1
+%define builddebug	@@DEBUG@@
 %endif
 
 %ifarch ppc64
 %define karch		ppc64
+%define builddebug	@@DEBUG@@
 %endif
 
 %ifarch s390x
 %define karch		s390x
+%define builddebug	@@DEBUG@@
 %endif
 
 
@@ -106,6 +112,23 @@
 %endif
 
 
+%if %{builddebug}
+%package -n oracleasm-%{kver}debug
+Summary: The Oracle Automatic Storage Management library driver for debug systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: oracleasm = %{version}
+Requires: kernel-debug = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-debug-devel = %{kver}
+
+%description -n oracleasm-%{kver}debug
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for the debug kernel.
+%endif
+
+
 %prep
 %setup -n oracleasm-%{version}
 
@@ -177,8 +200,22 @@
 make clean
 %endif
 
+%if %{builddebug}
+local_configure "%{kver}debug"
 
+make V=0
+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}debug/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}debug/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+
 %install
 
 
@@ -215,9 +252,20 @@
 /lib/modules/%{kver}xen/kernel/drivers/addon/oracleasm
 %endif
 
+%if %{builddebug}
+%post -n oracleasm-%{kver}debug
+depmod -ae %{kver}debug
 
+%files -n oracleasm-%{kver}debug
+%defattr(-,root,root)
+/lib/modules/%{kver}debug/kernel/drivers/addon/oracleasm
+%endif
 
+
 %changelog
+* Mon Nov 12 2007 Sunil Mushran <sunil.mushran at oracle.com>
+- Add support to build modules for kernel-debug for RHEL5
+
 * Wed Apr 18 2007 Joel Becker <joel.becker at oracle.com>
 - Add RHEL5