[Ocfs2-commits] jlbec commits r1823 - in trunk: . fs vendor
vendor/redhat vendor/suse
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jan 21 16:44:49 CST 2005
Author: jlbec
Date: 2005-01-21 16:44:47 -0600 (Fri, 21 Jan 2005)
New Revision: 1823
Added:
trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
Removed:
trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in
trunk/vendor/unitedlinux/
Modified:
trunk/Makefile
trunk/configure.in
trunk/fs/Makefile
trunk/vendor/redhat/Makefile
trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
Log:
o Make happy fun specfile updates.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-01-21 21:36:27 UTC (rev 1822)
+++ trunk/Makefile 2005-01-21 22:44:47 UTC (rev 1823)
@@ -17,32 +17,35 @@
install-sh \
mkinstalldirs
-
+#
# REDHAT
+#
rhel3_srpm: dist
rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/redhat/ocfs2-2.4.21-EL.spec
rhel3_rpm: rhel3_srpm
rpmbuild --rebuild --target i686 "ocfs2-2.4.21-EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
-
-# UNITED LINUX
#
-$(TOPDIR)/vendor/unitedlinux/ocfs2-2.4.21-%.spec: $(TOPDIR)/vendor/unitedlinux/ocfs2-2.4.21.spec-generic
+# RHEL3
+#
+$(TOPDIR)/vendor/redhat/ocfs2-2.4.21-%.EL.spec: $(TOPDIR)/vendor/suse/ocfs2-2.4.21-EL.spec-generic
SPECVER="$@"; \
SPECVER="$${SPECVER#*ocfs2-2.4.21-}"; \
- SPECVER="$${SPECVER%.spec}"; \
+ SPECVER="$${SPECVER%.EL.spec}"; \
sed -e 's/^%define sver.*%{generic}$$/%define sver '$${SPECVER}'/' < $< > $@
-ul10sp3_%_srpm: dist $(TOPDIR)/vendor/unitedlinux/ocfs2-2.4.21-%.spec
- rpm -bs --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" $(TOPDIR)/vendor/unitedlinux/ocfs2-2.4.21-$(patsubst ul10sp3_%_srpm,%,$@).spec
+rhel3_%_srpm: dist $(TOPDIR)/vendor/redhat/ocfs2-2.4.21-%.EL.spec
+ rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/redhat/ocfs2-2.4.21-$(patsubst rhel3_%_srpm,%,$@).EL.spec
-ul10sp3_%_rpm: ul10sp3_%_srpm
- rpm --rebuild --target i586 "ocfs2-2.4.21-$(patsubst ul10sp3_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+rhel3_%_rpm: rhel3_%_srpm
+ rpmbuild --rebuild --target i686 "ocfs2-2.4.21-$(patsubst rhel3_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
-# SLES
+
#
+# SLES9
+#
$(TOPDIR)/vendor/suse/ocfs2-2.6.5-%.spec: $(TOPDIR)/vendor/suse/ocfs2-2.6.5.spec-generic
SPECVER="$@"; \
SPECVER="$${SPECVER#*ocfs2-2.6.5-}"; \
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-01-21 21:36:27 UTC (rev 1822)
+++ trunk/configure.in 2005-01-21 22:44:47 UTC (rev 1823)
@@ -338,7 +338,6 @@
AC_SUBST(GCCINC)
AC_OUTPUT([Config.make
-vendor/redhat/ocfs2-2.4.21-EL.spec
-vendor/unitedlinux/ocfs2-2.4.21.spec-generic
+vendor/redhat/ocfs2-2.4.21-EL.spec-generic
vendor/suse/ocfs2-2.6.5.spec-generic
])
Modified: trunk/fs/Makefile
===================================================================
--- trunk/fs/Makefile 2005-01-21 21:36:27 UTC (rev 1822)
+++ trunk/fs/Makefile 2005-01-21 22:44:47 UTC (rev 1823)
@@ -51,7 +51,7 @@
clean-modules:
$(MAKE) -C $(KERNELDIR) M=$(CURDIR) clean
- rm ocfs2/stamp-md5
+ -rm ocfs2/stamp-md5
else
#
# This is a 2.4 kernel. Let Makebo handle recursion.
Modified: trunk/vendor/redhat/Makefile
===================================================================
--- trunk/vendor/redhat/Makefile 2005-01-21 21:36:27 UTC (rev 1822)
+++ trunk/vendor/redhat/Makefile 2005-01-21 22:44:47 UTC (rev 1823)
@@ -3,6 +3,6 @@
include $(TOPDIR)/Preamble.make
DIST_FILES = \
- ocfs2-2.4.21-EL.spec.in
+ ocfs2-2.4.21-EL.spec-generic.in
include $(TOPDIR)/Postamble.make
Copied: trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in (from rev 1821, trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in)
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in 2005-01-21 20:42:55 UTC (rev 1821)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in 2005-01-21 22:44:47 UTC (rev 1823)
@@ -0,0 +1,199 @@
+#
+# Spec file for ocfs2
+#
+
+# Macros
+# This one is hardcoded because, well, it belongs there
+%define _prefix /usr
+# Because RPM is dumb
+%define _unpackaged_files_terminate_build 0
+
+# Turn on's and off's (summit and debug not used but added
+# for future proofing)
+%define buildup 1
+%define buildsmp 1
+%define buildhugemem 1
+%define builddebug 0
+
+# From EL3 kernel specfile
+%ifnarch i686
+%define buildhugemem 0
+%endif
+
+%ifarch ia32e
+%define buildsmp 0
+%endif
+
+%ifarch s390 s390x
+%define buildsmp 0
+%endif
+%ifarch ppc64pseries ppc64iseries
+%define buildsmp 0
+%endif
+%ifarch ia64
+%define buildsmp 0
+%endif
+
+%define base 2.4.21
+%define sver %{generic}
+%define kver %{base}-%{sver}.EL
+
+# The minimum -support package required for the kernel bits.
+%define support_ver @SUPPORT_REQUIRED_VERSION@
+
+Summary: The Oracle Cluster Filesystem 2
+Name: ocfs2-%{kver}
+Version: @DIST_VERSION@
+Release: @RPM_VERSION@
+Copyright: GPL
+Group: System Environment/Kernel
+Source: ocfs2- at DIST_VERSION@.tar.gz
+URL: http://oss.oracle.com/projects/ocfs2/
+Distribution: Oracle
+Vendor: Oracle Corporation
+Packager: Joel Becker <joel.becker at oracle.com>
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+
+BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+
+
+%description
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+uniprocessor kernels.
+
+%if %{buildsmp}
+%package smp
+Summary: The Oracle Cluster Filesystem 2 for SMP systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-smp = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+AutoReqProv: no
+
+
+%description smp
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+symmetric multiprocessor kernels.
+%endif
+
+
+%if %{buildhugemem}
+%package hugemem
+Summary: The Oracle Cluster Filesystem for huge memory systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-hugemem = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+AutoReqProv: no
+
+
+%description hugemem
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+symmetric multiprocessor kernels.
+%endif
+
+
+%if %{builddebug}
+%package debug
+Summary: The Oracle Cluster Filesystem 2 for debugging systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-debug = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+AutoReqProv: no
+
+
+%description debug
+OCFS2 is the Oracle Cluster Filesystem 2. This package is compiled for
+debugging kernels.
+%endif
+
+
+%prep
+%setup -n ocfs2-%{version}
+
+
+%build
+KPATH="/usr/src/linux-%{kver}"
+%configure --with-kernel="${KPATH}"
+
+%if %{buildup}
+make KVER=up QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/${kver}/ocfs2" install
+make clean
+%endif
+
+%if %{buildsmp}
+make KVER=smp QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}smp/ocfs2" install
+make clean
+%endif
+
+%if %{buildhugemem}
+make KVER=hugemem QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}hugemem/ocfs2" install
+make clean
+%endif
+
+%if %{builddebug}
+make KVER=debug QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}debug/ocfs2" install
+make clean
+%endif
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+%if %{buildup}
+%post
+depmod -a
+
+%files
+%defattr(-,root,root)
+/lib/modules/%{kver}/ocfs2
+%endif
+
+%if %{buildsmp}
+%post smp
+depmod -a
+
+%files smp
+%defattr(-,root,root)
+/lib/modules/%{kver}smp/ocfs2
+%endif
+
+%if %{buildhugemem}
+%post
+depmod -a
+
+%files hugemem
+%defattr(-,root,root)
+/lib/modules/%{kver}hugemem/ocfs2
+%endif
+
+%if %{builddebug}
+%post debug
+depmod -a
+
+%files debug
+%defattr(-,root,root)
+/lib/modules/%{kver}debug/ocfs2
+%endif
+
+
+%changelog
+* Fri Jan 21 2004 Joel Becker <joel.becker at oracle.com>
+- Migrate to OCFS2
+
+* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
+- Initial rpm spec file
Deleted: trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in 2005-01-21 21:36:27 UTC (rev 1822)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in 2005-01-21 22:44:47 UTC (rev 1823)
@@ -1,220 +0,0 @@
-#
-# Spec file for ocfs2
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-# Because RPM is dumb
-%define _unpackaged_files_terminate_build 0
-
-# Turn on's and off's (summit and debug not used but added
-# for future proofing)
-%define chicks 1
-%define buildup 1
-%define buildsmp 1
-%define buildhugemem 1
-%define builddebug 0
-
-# From EL3 kernel specfile
-%ifnarch i686
-%define buildhugemem 0
-%endif
-
-%ifarch s390 s390x
-%define buildsmp 0
-%endif
-%ifarch ppc64pseries ppc64iseries
-%define buildsmp 0
-%endif
-%ifarch ia64
-%define buildsmp 0
-%endif
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base 2.4.21
-%define abi 2.4.21-EL
-%define kver %{base}-15.EL
-
-# The minimum -support package required for the kernel bits.
-%define support_ver @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 2
-Name: ocfs2-%{abi}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: kernel >= %{kver}
-Requires: ocfs2-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem Version 2. This package is compiled for
-uniprocessor kernels.
-
-%if %{buildsmp}
-%package smp
-Summary: The Oracle Cluster Filesystem Version 2 for SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-smp >= %{kver}
-Requires: ocfs2-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description smp
-OCFS2 is the Oracle Cluster Filesystem Version 2. This package is compiled for
-symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildhugemem}
-%package hugemem
-Summary: The Oracle Cluster Filesystem for huge memory systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-hugemem >= %{kver}
-Requires: ocfs2-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description hugemem
-OCFS2 is the Oracle Cluster Filesystem Version 2. This package is compiled for
-symmetric multiprocessor kernels.
-%endif
-
-
-%if %{builddebug}
-%package debug
-Summary: The Oracle Cluster Filesystem Version 2 for debugging systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-debug >= %{kver}
-Requires: ocfs2-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description debug
-OCFS2 is the Oracle Cluster Filesystem Version 2. This package is compiled for
-debugging kernels.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-# Hack to find a good source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}"; then
- KVER="%{kver}"
-else
- CURKVER="`uname -r | awk '{sub(/smp$|hugemem$|debug$/,"");print}'`"
- case "$CURKVER" in
- %{base}*)
- if test -d "/usr/src/linux-${CURKVER}"; then
- KVER="${CURKVER}"
- fi
- ;;
- *)
- ;;
- esac
-fi
-
-if test -z "$KVER" ; then
- if test -d "/usr/src/linux-2.4" ; then
- KPATH="/usr/src/linux-2.4"
- elif test -d "/usr/src/linux" ; then
- KPATH="/usr/src/linux"
- else
- echo "No kernel tree to build from!" >&2
- exit 1
- fi
-else
- KPATH="/usr/src/linux-${KVER}"
-fi
-
-%configure --with-kernel="${KPATH}" --enable-aio=no
-cd src
-
-%if %{buildup}
-make KVER=up QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{abi}-ABI/ocfs2" install
-%endif
-
-%if %{buildsmp}
-make clean
-make KVER=smp QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{abi}-smp-ABI/ocfs2" install
-%endif
-
-%if %{buildhugemem}
-make clean
-make KVER=hugemem QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{abi}-hugemem-ABI/ocfs2" install
-%endif
-
-%if %{builddebug}
-make clean
-make KVER=debug QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{abi}-debug-ABI/ocfs2" install
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{buildup}
-%post
-/etc/init.d/ocfs2 link
-
-%files
-%defattr(-,root,root)
-/lib/modules/%{abi}-ABI/ocfs2
-%endif
-
-%if %{buildsmp}
-%post smp
-/etc/init.d/ocfs2 link
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{abi}-smp-ABI/ocfs2
-%endif
-
-%if %{buildhugemem}
-%post hugemem
-/etc/init.d/ocfs2 link
-
-%files hugemem
-%defattr(-,root,root)
-/lib/modules/%{abi}-hugemem-ABI/ocfs2
-%endif
-
-%if %{builddebug}
-%files debug
-%defattr(-,root,root)
-/lib/modules/%{abi}-debug-ABI/ocfs2
-%endif
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file
Modified: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in 2005-01-21 21:36:27 UTC (rev 1822)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in 2005-01-21 22:44:47 UTC (rev 1823)
@@ -77,7 +77,7 @@
# The minimum -support package required for the kernel bits.
%define support_ver @SUPPORT_REQUIRED_VERSION@
-Summary: The Oracle Cluster Filesystem Version 2.
+Summary: The Oracle Cluster Filesystem 2.
Name: ocfs2-%{kver}
Version: @DIST_VERSION@
Release: @RPM_VERSION@
@@ -99,12 +99,12 @@
%description
-OCFS2 is the Oracle Cluster Filesystem Version 2.
+OCFS2 is the Oracle Cluster Filesystem 2.
This package is compiled for the default kernel.
%if %{builddefault}
%package default
-Summary: The Oracle Cluster File System Version 2 for UP systems.
+Summary: The Oracle Cluster File System 2 for UP systems.
Group: System Environment/Kernel
AutoReqProv: no
Provides: ocfs2 = %{version}
@@ -113,14 +113,14 @@
BuildRequires: kernel-source = %{kver}
%description default
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for the default kernel.
%endif
%if %{buildsmp}
%package smp
-Summary: The Oracle Cluster File System Version 2 for SMP systems.
+Summary: The Oracle Cluster File System 2 for SMP systems.
Group: System Environment/Kernel
AutoReqProv: no
Provides: ocfs2 = %{version}
@@ -129,14 +129,14 @@
BuildRequires: kernel-source = %{kver}
%description smp
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for symmetric multiprocessor kernels.
%endif
%if %{buildbigsmp}
%package bigsmp
-Summary: The Oracle Cluster File System Version 2 for BigSMP systems.
+Summary: The Oracle Cluster File System 2 for BigSMP systems.
Group: System Environment/Kernel
AutoReqProv: no
Provides: ocfs2 = %{version}
@@ -145,14 +145,14 @@
BuildRequires: kernel-source = %{kver}
%description bigsmp
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for large memory symmetric multiprocessor kernels.
%endif
%if %{build64kpagesize}
%package 64k-pagesize
-Summary: The Oracle Cluster File System Version 2 for Itanium 64k pagesize systems.
+Summary: The Oracle Cluster File System 2 for Itanium 64k pagesize systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -161,14 +161,14 @@
BuildRequires: kernel-source = %{kver}
%description 64k-pagesize
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for Itanium 64k pagesize systems.
%endif
%if %{buildsn2}
%package sn2
-Summary: The Oracle Cluster File System Version 2 for SGI Altix systems.
+Summary: The Oracle Cluster File System 2 for SGI Altix systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -177,14 +177,14 @@
BuildRequires: kernel-source = %{kver}
%description sn2
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for SGI Altix systems.
%endif
%if %{buildiseries64}
%package iseries64
-Summary: The Oracle Cluster File System Version 2 for iSeries systems.
+Summary: The Oracle Cluster File System 2 for iSeries systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -193,14 +193,14 @@
BuildRequires: kernel-source = %{kver}
%description iseries64
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for iSeries kernels.
%endif
%if %{buildpmac64}
%package pmac64
-Summary: The Oracle Cluster File System Version 2 for 64-bit Power Macintosh systems.
+Summary: The Oracle Cluster File System 2 for 64-bit Power Macintosh systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -209,14 +209,14 @@
BuildRequires: kernel-source = %{kver}
%description pmac64
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for 64-bit Power Macintosh kernels.
%endif
%if %{buildpseries64}
%package pseries64
-Summary: The Oracle Cluster File System Version 2 for pSeries systems.
+Summary: The Oracle Cluster File System 2 for pSeries systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -225,14 +225,14 @@
BuildRequires: kernel-source = %{kver}
%description pseries64
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for pSeries kernels.
%endif
%if %{builds390}
%package s390
-Summary: The Oracle Cluster File System Version 2 for IBM S/390 31-bit systems.
+Summary: The Oracle Cluster File System 2 for IBM S/390 31-bit systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -241,14 +241,14 @@
BuildRequires: kernel-source = %{kver}
%description s390
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for IBM S/390 31-bit kernels.
%endif
%if %{builds390x}
%package s390x
-Summary: The Oracle Cluster File System Version 2 for zSeries systems.
+Summary: The Oracle Cluster File System 2 for zSeries systems.
Group: System Environment/Kernel
Provides: ocfs2 = %{version}
AutoReqProv: no
@@ -257,7 +257,7 @@
BuildRequires: kernel-source = %{kver}
%description s390x
-The Oracle Cluster Filesystem Version 2.
+The Oracle Cluster Filesystem 2.
This package is compiled for zSeries kernels.
%endif
@@ -271,101 +271,81 @@
%if %{builddefault}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/default"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{buildsmp}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/smp"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{buildbigsmp}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/bigsmp"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{build64kpagesize}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/64k-pagesize"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{buildsn2}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/sn2"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-sn2/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{buildiseries64}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/iseries64"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-iseries64/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{buildpmac64}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pmac64"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-pmac64/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{buildpseries64}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pseries64"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-pseries64/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{builds390}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-s390/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
%if %{builds390x}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390x"
%configure --with-kernel="${KPATH}"
-cd src
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-s390x/kernel/drivers/addon/ocfs2" install
make clean
-cd ..
%endif
More information about the Ocfs2-commits
mailing list