[Ocfs2-commits] smushran commits r3009 -
branches/ocfs2-1.2/vendor/rhel5
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Apr 20 15:49:50 PDT 2007
Author: smushran
Date: 2007-04-20 15:49:49 -0700 (Fri, 20 Apr 2007)
New Revision: 3009
Modified:
branches/ocfs2-1.2/vendor/rhel5/Vendor.make
branches/ocfs2-1.2/vendor/rhel5/kernel.guess
branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in
Log:
ocfs2: Build el5 rpms for default, PAE and xen kernel flavors
Signed-off-by: jlbec
Modified: branches/ocfs2-1.2/vendor/rhel5/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/Vendor.make 2007-04-16 21:54:37 UTC (rev 3008)
+++ branches/ocfs2-1.2/vendor/rhel5/Vendor.make 2007-04-20 22:49:49 UTC (rev 3009)
@@ -9,15 +9,7 @@
SPECVER="$@"; \
SPECVER="$${SPECVER#*ocfs2-}"; \
SPECVER="$${SPECVER%.spec}"; \
- LARGEVER="$${SPECVER#2.6.9-}"; \
- LARGEVER="$${LARGEVER%%.*}"; \
- if [ "$${LARGEVER}" -lt 34 ]; \
- then \
- LARGESMP=0; \
- else \
- LARGESMP=1; \
- fi; \
- sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' -e 's/@@LARGESMP@@/'$${LARGESMP}'/' < $< > $@
+ sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
rhel5_%_srpm: dist $(TOPDIR)/vendor/rhel5/ocfs2-%.spec
rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel5/ocfs2-$(patsubst rhel5_%_srpm,%,$@).spec
Modified: branches/ocfs2-1.2/vendor/rhel5/kernel.guess
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/kernel.guess 2007-04-16 21:54:37 UTC (rev 3008)
+++ branches/ocfs2-1.2/vendor/rhel5/kernel.guess 2007-04-20 22:49:49 UTC (rev 3009)
@@ -17,9 +17,9 @@
# a very simple type list :-)
#
RHEL5_KERNEL_TYPES="
- i686:
- x86_64:
- ia64:
+ i686:,PAE,xen
+ x86_64:,xen
+ ia64:,xen
ppc64:
s390x:
"
@@ -36,6 +36,12 @@
{
# Only one type for rhel5
case "$1" in
+ *PAE)
+ echo "PAE"
+ ;;
+ *xen)
+ echo "xen"
+ ;;
*)
echo ""
;;
Modified: branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in 2007-04-16 21:54:37 UTC (rev 3008)
+++ branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in 2007-04-20 22:49:49 UTC (rev 3009)
@@ -8,16 +8,25 @@
# Because RPM is dumb
%define _unpackaged_files_terminate_build 0
+# Turn ons and offs
+%define builddef 1
+%define buildpae 0
+%define buildxen 0
+
%ifarch i686
%define karch i686
+%define buildpae 1
+%define buildxen 1
%endif
%ifarch x86_64
%define karch x86_64
+%define buildxen 1
%endif
%ifarch ia64
%define karch ia64
+%define buildxen 1
%endif
%ifarch ppc64
@@ -55,9 +64,42 @@
%description
-OCFS2 is the Oracle Cluster Filesystem 2.
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+the default kernel.
+%if %{buildpae}
+%package -n ocfs2-%{kver}PAE
+Summary: The Oracle Cluster File System 2 for the PAE kernel.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-PAE = %{kver}
+Requires: ocfs2-tools >= %{tools_ver}
+BuildRequires: kernel-PAE-devel = %{kver}
+AutoReqProv: no
+
+%description -n ocfs2-%{kver}PAE
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+the PAE kernel.
+%endif
+
+
+%if %{buildxen}
+%package -n ocfs2-%{kver}xen
+Summary: The Oracle Cluster File System 2 for the XEN kernel.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-xen = %{kver}
+Requires: ocfs2-tools >= %{tools_ver}
+BuildRequires: kernel-xen-devel = %{kver}
+AutoReqProv: no
+
+%description -n ocfs2-%{kver}xen
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+the XEN kernel.
+%endif
+
+
%prep
%setup -n ocfs2-%{version}
@@ -84,6 +126,7 @@
--with-vendorkernel="$1"
}
+%if %{builddef}
local_configure "%{kver}"
make V=0
@@ -98,21 +141,80 @@
mv "${EXTRA_MODLIB}"/$i/ocfs2*.ko "${INST_MODLIB}/fs/$i"
rm -f "${EXTRA_MODLIB}"/$i/*.ko
done
+make clean
+%endif
+%if %{buildpae}
+local_configure "%{kver}PAE"
+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}PAE/extra/"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}PAE/kernel"
+for i in ocfs2/ ocfs2/dlm/ ocfs2/cluster/
+do
+ mkdir -p "${INST_MODLIB}/fs/$i"
+ mv "${EXTRA_MODLIB}"/$i/ocfs2*.ko "${INST_MODLIB}/fs/$i"
+ rm -f "${EXTRA_MODLIB}"/$i/*.ko
+done
+make clean
+%endif
+
+%if %{buildxen}
+local_configure "%{kver}xen"
+
+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}xen/extra/"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}xen/kernel"
+for i in ocfs2/ ocfs2/dlm/ ocfs2/cluster/
+do
+ mkdir -p "${INST_MODLIB}/fs/$i"
+ mv "${EXTRA_MODLIB}"/$i/ocfs2*.ko "${INST_MODLIB}/fs/$i"
+ rm -f "${EXTRA_MODLIB}"/$i/*.ko
+done
+make clean
+%endif
+
+
%clean
rm -rf "$RPM_BUILD_ROOT"
-
+%if %{builddef}
%post
depmod -ae %{kver}
%files
%defattr(-,root,root)
/lib/modules/%{kver}/kernel/fs
+%endif
+%if %{buildpae}
+%post -n ocfs2-%{kver}PAE
+depmod -ae %{kver}PAE
+%files -n ocfs2-%{kver}PAE
+%defattr(-,root,root)
+/lib/modules/%{kver}PAE/kernel/fs
+%endif
+
+%if %{buildxen}
+%post -n ocfs2-%{kver}xen
+depmod -ae %{kver}xen
+
+%files -n ocfs2-%{kver}xen
+%defattr(-,root,root)
+/lib/modules/%{kver}xen/kernel/fs
+%endif
+
%changelog
+* Thu Apr 12 2007 Sunil Mushran <sunil.mushran at oracle.com>
+- Add PAE and xen for RHEL5
+
* Wed Feb 21 2007 Joel Becker <joel.becker at oracle.com>
- Modify for rhel5
More information about the Ocfs2-commits
mailing list