[Ocfs2-commits] smushran commits r3084 - branches/ocfs2-1.2/vendor/rhel4

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2008-05-02 14:15:10 -0700 (Fri, 02 May 2008)
New Revision: 3084

Modified:
   branches/ocfs2-1.2/vendor/rhel4/Vendor.make
   branches/ocfs2-1.2/vendor/rhel4/kernel.guess
   branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
Log:
ocfs2: Add build support for xenU el4 kernels
Signed-off-by: jlbec

Modified: branches/ocfs2-1.2/vendor/rhel4/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/Vendor.make	2008-05-02 21:14:11 UTC (rev 3083)
+++ branches/ocfs2-1.2/vendor/rhel4/Vendor.make	2008-05-02 21:15:10 UTC (rev 3084)
@@ -9,15 +9,21 @@
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*ocfs2-}"; \
 		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}'/' -e 's/@@DONT_STRIP@@/'$(DONT_STRIP)'/' < $< > $@
+		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}'/' -e 's/@@DONT_STRIP@@/'$(DONT_STRIP)'/' < $< > $@
 
 rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/ocfs2-%.spec
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/ocfs2-$(patsubst rhel4_%_srpm,%,$@).spec

Modified: branches/ocfs2-1.2/vendor/rhel4/kernel.guess
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/kernel.guess	2008-05-02 21:14:11 UTC (rev 3083)
+++ branches/ocfs2-1.2/vendor/rhel4/kernel.guess	2008-05-02 21:15:10 UTC (rev 3084)
@@ -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"
         ;;
@@ -163,12 +166,18 @@
     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: branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2008-05-02 21:14:11 UTC (rev 3083)
+++ branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2008-05-02 21:15:10 UTC (rev 3084)
@@ -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 ia64
@@ -121,7 +124,21 @@
 large symmetric multiprocessor kernels.
 %endif
 
+%if %{buildxenu}
+%package -n ocfs2-%{kver}xenU
+Summary: The Oracle Cluster File System 2 for Xen DomU kernels.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-xenU = %{kver}
+Requires: ocfs2-tools >= %{tools_ver}
+BuildRequires: kernel-xenU-devel = %{kver}
+AutoReqProv: no
 
+%description -n ocfs2-%{kver}xenU
+OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
+Xen DomU kernels.
+%endif
+
 %build
 
 local_configure()
@@ -244,7 +261,28 @@
 make clean
 %endif
 
+%if %{buildxenu}
+local_configure "%{kver}xenU"
 
+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}xenU/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}xenU/kernel"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/configfs"
+mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+mkdir -p "${INST_MODLIB}/fs/debugfs"
+mv "${EXTRA_MODLIB}"/debugfs.ko "${INST_MODLIB}/fs/debugfs/"
+rm "${EXTRA_MODLIB}"/*.ko
+
+strip_modules "${INST_MODLIB}"
+
+make clean
+%endif
+
 %install
 # We don't do anything here, but it is required to force RPM
 # magic behaviors ... thanks guys.
@@ -290,7 +328,19 @@
 /lib/modules/%{kver}largesmp/kernel/fs
 %endif
 
+%if %{buildxenu}
+%post -n ocfs2-%{kver}xenU
+depmod -ae %{kver}xenU
+
+%files -n ocfs2-%{kver}xenU
+%defattr(-,root,root)
+/lib/modules/%{kver}xenU/kernel/fs
+%endif
+
 %changelog
+* Thu Oct 10 2007 Sunil Mushran <sunil.mushran at oracle.com>
+- Add xenU
+
 * Thu Jun 22 2006 Sunil Mushran <sunil.mushran at oracle.com>
 - Add largesmp