[Ocfs2-commits] jlbec commits r813 - in trunk: . vendor/unitedlinux

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Fri Mar 26 12:49:15 CST 2004


Author: jlbec
Date: 2004-03-26 12:49:13 -0600 (Fri, 26 Mar 2004)
New Revision: 813

Added:
   trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in
Removed:
   trunk/vendor/unitedlinux/ocfs2-2.4.21-107.spec.in
   trunk/vendor/unitedlinux/ocfs2-2.4.21-111.spec.in
   trunk/vendor/unitedlinux/ocfs2-2.4.21-138.spec.in
Modified:
   trunk/
   trunk/Makefile
   trunk/configure.in
   trunk/vendor/unitedlinux/
   trunk/vendor/unitedlinux/Makefile
Log:
ul new style specfiles


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - configure
Config.make
config.cache
config.log
config.status
autom4te.cache

   + configure
Config.make
config.cache
config.log
config.status
autom4te.cache
*.rpm
*.tar.gz


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/Makefile	2004-03-26 18:49:13 UTC (rev 813)
@@ -69,7 +69,14 @@
 ul4gb_rpm: ul4gb_srpm
 	rpm --rebuild --target i586 "ocfs2-2.4.19-4GB-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
 
-ul10sp3_%_srpm: dist
+
+$(TOPDIR)/vendor/unitedlinux/ocfs2-2.4.21-%.spec: $(TOPDIR)/vendor/unitedlinux/ocfs2-2.4.21.spec-generic
+	SPECVER="$@"; \
+		SPECVER="$${SPECVER#*ocfs2-2.4.21-}"; \
+		SPECVER="$${SPECVER%.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
 
 ul10sp3_%_rpm: ul10sp3_%_srpm

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/configure.in	2004-03-26 18:49:13 UTC (rev 813)
@@ -350,7 +350,5 @@
 vendor/unitedlinux/ocfs2-2.4.19-64GB-SMP.spec
 vendor/unitedlinux/ocfs2-2.4.19-4GB-SMP.spec
 vendor/unitedlinux/ocfs2-2.4.19-4GB.spec
-vendor/unitedlinux/ocfs2-2.4.21-107.spec
-vendor/unitedlinux/ocfs2-2.4.21-111.spec
-vendor/unitedlinux/ocfs2-2.4.21-138.spec
+vendor/unitedlinux/ocfs2-2.4.21.spec-generic
 ])


Property changes on: trunk/vendor/unitedlinux
___________________________________________________________________
Name: svn:ignore
   - ocfs2-*.spec

   + ocfs2-*.spec
ocfs2-2.4.21.spec-generic


Modified: trunk/vendor/unitedlinux/Makefile
===================================================================
--- trunk/vendor/unitedlinux/Makefile	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/vendor/unitedlinux/Makefile	2004-03-26 18:49:13 UTC (rev 813)
@@ -6,8 +6,6 @@
 	ocfs2-2.4.19-64GB-SMP.spec.in		\
 	ocfs2-2.4.19-4GB-SMP.spec.in		\
 	ocfs2-2.4.19-4GB.spec.in		\
-	ocfs2-2.4.21-107.spec.in		\
-	ocfs2-2.4.21-111.spec.in		\
-	ocfs2-2.4.21-138.spec.in
+	ocfs2-2.4.21.spec-generic.in
 
 include $(TOPDIR)/Postamble.make

Deleted: trunk/vendor/unitedlinux/ocfs2-2.4.21-107.spec.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.21-107.spec.in	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.21-107.spec.in	2004-03-26 18:49:13 UTC (rev 813)
@@ -1,297 +0,0 @@
-#
-# Spec file for OCFS2 on UL 1.0 SP3
-#
-
-# 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 builddeflt		1
-%define buildsmp		1
-%define buildpsmp		1
-%define buildnuma		0
-%define builditanium2		0
-%define builditanium2smp	0
-
-%ifarch ia64
-%define builddeflt		0
-%define buildsmp		0
-%define buildpsmp		0
-%define builditanium2		1
-%define builditanium2smp	1
-%endif
-
-%ifarch x86_64
-%define buildpsmp		0
-%define buildnuma		1
-%endif
-
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base		2.4.21
-%define sver		107
-%define kver		%{base}-%{sver}
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 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: k_deflt = %{kver}
-Requires: ocfs-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 the default kernel.
-
-%if %{builddeflt}
-%package deflt
-Summary: The Oracle Cluster File System Version 2 for UP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: ocfs2 = %{version}
-Requires: k_deflt = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description deflt
-The Oracle Cluster Filesystem Version 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.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: ocfs2 = %{version}
-Requires: k_smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description smp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildpsmp}
-%package psmp
-Summary: The Oracle Cluster File System Version 2 for Pentium SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_psmp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description psmp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for Pentium SMP kernels.
-%endif
-
-
-%if %{buildnuma}
-%package numa
-Summary: The Oracle Cluster File System Version 2 for NUMA systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_numa = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description numa
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for NUMA kernels.
-%endif
-
-
-%if %{builditanium2}
-%package itanium2
-Summary: The Oracle Cluster File System Version 2 for UP Itanium2 systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_itanium2 = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description itanium2
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for UP Itanium2 kernels.
-%endif
-
-
-%if %{builditanium2smp}
-%package itanium2-smp
-Summary: The Oracle Cluster File System Version 2 for SMP Itanium2 systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_itanium2-smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description itanium2-smp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for Itanium2 SMP kernels.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-
-%if %{builddeflt}
-KPATH="/usr/src/linux-%{kver}-include/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}-include/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 %{buildpsmp}
-KPATH="/usr/src/linux-%{kver}-include/psmp"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{buildnuma}
-KPATH="/usr/src/linux-%{kver}-include/numa"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{builditanium2}
-KPATH="/usr/src/linux-%{kver}-include/itanium2"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{builditanium2smp}
-KPATH="/usr/src/linux-%{kver}-include/itanium2-smp"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{builddeflt}
-%post deflt
-depmod -a
-
-%files deflt
-%defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildsmp}
-%post smp
-depmod -a
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildpsmp}
-%post psmp
-depmod -a
-
-%files psmp
-%defattr(-,root,root)
-/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildnuma}
-%post numa
-depmod -a
-
-%files numa
-%defattr(-,root,root)
-/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{builditanium2}
-%post itanium2
-depmod -a
-
-%files itanium2
-%defattr(-,root,root)
-/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{builditanium2smp}
-%post itanium2-smp
-depmod -a
-
-%files itanium2-smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Deleted: trunk/vendor/unitedlinux/ocfs2-2.4.21-111.spec.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.21-111.spec.in	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.21-111.spec.in	2004-03-26 18:49:13 UTC (rev 813)
@@ -1,297 +0,0 @@
-#
-# Spec file for OCFS2 on UL 1.0 SP3
-#
-
-# 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 builddeflt		1
-%define buildsmp		1
-%define buildpsmp		1
-%define buildnuma		0
-%define builditanium2		0
-%define builditanium2smp	0
-
-%ifarch ia64
-%define builddeflt		0
-%define buildsmp		0
-%define buildpsmp		0
-%define builditanium2		1
-%define builditanium2smp	1
-%endif
-
-%ifarch x86_64
-%define buildpsmp		0
-%define buildnuma		1
-%endif
-
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base		2.4.21
-%define sver		111
-%define kver		%{base}-%{sver}
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 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: k_deflt = %{kver}
-Requires: ocfs-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 the default kernel.
-
-%if %{builddeflt}
-%package deflt
-Summary: The Oracle Cluster File System Version 2 for UP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: ocfs2 = %{version}
-Requires: k_deflt = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description deflt
-The Oracle Cluster Filesystem Version 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.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: ocfs2 = %{version}
-Requires: k_smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description smp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildpsmp}
-%package psmp
-Summary: The Oracle Cluster File System Version 2 for Pentium SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_psmp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description psmp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for Pentium SMP kernels.
-%endif
-
-
-%if %{buildnuma}
-%package numa
-Summary: The Oracle Cluster File System Version 2 for NUMA systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_numa = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description numa
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for NUMA kernels.
-%endif
-
-
-%if %{builditanium2}
-%package itanium2
-Summary: The Oracle Cluster File System Version 2 for UP Itanium2 systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_itanium2 = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description itanium2
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for UP Itanium2 kernels.
-%endif
-
-
-%if %{builditanium2smp}
-%package itanium2-smp
-Summary: The Oracle Cluster File System Version 2 for SMP Itanium2 systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_itanium2-smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description itanium2-smp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for Itanium2 SMP kernels.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-
-%if %{builddeflt}
-KPATH="/usr/src/linux-%{kver}-include/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}-include/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 %{buildpsmp}
-KPATH="/usr/src/linux-%{kver}-include/psmp"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{buildnuma}
-KPATH="/usr/src/linux-%{kver}-include/numa"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{builditanium2}
-KPATH="/usr/src/linux-%{kver}-include/itanium2"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{builditanium2smp}
-KPATH="/usr/src/linux-%{kver}-include/itanium2-smp"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{builddeflt}
-%post deflt
-depmod -a
-
-%files deflt
-%defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildsmp}
-%post smp
-depmod -a
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildpsmp}
-%post psmp
-depmod -a
-
-%files psmp
-%defattr(-,root,root)
-/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildnuma}
-%post numa
-depmod -a
-
-%files numa
-%defattr(-,root,root)
-/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{builditanium2}
-%post itanium2
-depmod -a
-
-%files itanium2
-%defattr(-,root,root)
-/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{builditanium2smp}
-%post itanium2-smp
-depmod -a
-
-%files itanium2-smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Deleted: trunk/vendor/unitedlinux/ocfs2-2.4.21-138.spec.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.21-138.spec.in	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.21-138.spec.in	2004-03-26 18:49:13 UTC (rev 813)
@@ -1,297 +0,0 @@
-#
-# Spec file for OCFS2 on UL 1.0 SP3
-#
-
-# 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 builddeflt		1
-%define buildsmp		1
-%define buildpsmp		1
-%define buildnuma		0
-%define builditanium2		0
-%define builditanium2smp	0
-
-%ifarch ia64
-%define builddeflt		0
-%define buildsmp		0
-%define buildpsmp		0
-%define builditanium2		1
-%define builditanium2smp	1
-%endif
-
-%ifarch x86_64
-%define buildpsmp		0
-%define buildnuma		1
-%endif
-
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base		2.4.21
-%define sver		138
-%define kver		%{base}-%{sver}
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 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: k_deflt = %{kver}
-Requires: ocfs-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 the default kernel.
-
-%if %{builddeflt}
-%package deflt
-Summary: The Oracle Cluster File System Version 2 for UP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: ocfs2 = %{version}
-Requires: k_deflt = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description deflt
-The Oracle Cluster Filesystem Version 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.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: ocfs2 = %{version}
-Requires: k_smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description smp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildpsmp}
-%package psmp
-Summary: The Oracle Cluster File System Version 2 for Pentium SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_psmp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description psmp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for Pentium SMP kernels.
-%endif
-
-
-%if %{buildnuma}
-%package numa
-Summary: The Oracle Cluster File System Version 2 for NUMA systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_numa = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description numa
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for NUMA kernels.
-%endif
-
-
-%if %{builditanium2}
-%package itanium2
-Summary: The Oracle Cluster File System Version 2 for UP Itanium2 systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_itanium2 = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description itanium2
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for UP Itanium2 kernels.
-%endif
-
-
-%if %{builditanium2smp}
-%package itanium2-smp
-Summary: The Oracle Cluster File System Version 2 for SMP Itanium2 systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: k_itanium2-smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}
-
-%description itanium2-smp
-The Oracle Cluster Filesystem Version 2.
-This package is compiled for Itanium2 SMP kernels.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-
-%if %{builddeflt}
-KPATH="/usr/src/linux-%{kver}-include/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}-include/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 %{buildpsmp}
-KPATH="/usr/src/linux-%{kver}-include/psmp"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{buildnuma}
-KPATH="/usr/src/linux-%{kver}-include/numa"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{builditanium2}
-KPATH="/usr/src/linux-%{kver}-include/itanium2"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-%if %{builditanium2smp}
-KPATH="/usr/src/linux-%{kver}-include/itanium2-smp"
-%configure --with-kernel="${KPATH}"
-cd src
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2" install 
-make clean
-cd ..
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{builddeflt}
-%post deflt
-depmod -a
-
-%files deflt
-%defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildsmp}
-%post smp
-depmod -a
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildpsmp}
-%post psmp
-depmod -a
-
-%files psmp
-%defattr(-,root,root)
-/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{buildnuma}
-%post numa
-depmod -a
-
-%files numa
-%defattr(-,root,root)
-/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{builditanium2}
-%post itanium2
-depmod -a
-
-%files itanium2
-%defattr(-,root,root)
-/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2
-%endif
-
-
-%if %{builditanium2smp}
-%post itanium2-smp
-depmod -a
-
-%files itanium2-smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2
-%endif
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Copied: trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in (from rev 812, trunk/vendor/unitedlinux/ocfs2-2.4.21-107.spec.in)
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.21-107.spec.in	2004-03-25 02:37:12 UTC (rev 812)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in	2004-03-26 18:49:13 UTC (rev 813)
@@ -0,0 +1,297 @@
+#
+# Spec file for OCFS2 on UL 1.0 SP3
+#
+
+# 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 builddeflt		1
+%define buildsmp		1
+%define buildpsmp		1
+%define buildnuma		0
+%define builditanium2		0
+%define builditanium2smp	0
+
+%ifarch ia64
+%define builddeflt		0
+%define buildsmp		0
+%define buildpsmp		0
+%define builditanium2		1
+%define builditanium2smp	1
+%endif
+
+%ifarch x86_64
+%define buildpsmp		0
+%define buildnuma		1
+%endif
+
+
+
+# This must be changed to the minimum ABI compat kernel version expected
+%define base		2.4.21
+%define sver		%{generic}
+%define kver		%{base}-%{sver}
+
+# The minimum -support package required for the kernel bits.
+%define support_ver     @SUPPORT_REQUIRED_VERSION@
+
+Summary: The Oracle Cluster Filesystem Version 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: k_deflt = %{kver}
+Requires: ocfs-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 the default kernel.
+
+%if %{builddeflt}
+%package deflt
+Summary: The Oracle Cluster File System Version 2 for UP systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: ocfs2 = %{version}
+Requires: k_deflt = %{kver}
+Requires: ocfs-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description deflt
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: ocfs2 = %{version}
+Requires: k_smp = %{kver}
+Requires: ocfs-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description smp
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for symmetric multiprocessor kernels.
+%endif
+
+
+%if %{buildpsmp}
+%package psmp
+Summary: The Oracle Cluster File System Version 2 for Pentium SMP systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: k_psmp = %{kver}
+Requires: ocfs-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description psmp
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for Pentium SMP kernels.
+%endif
+
+
+%if %{buildnuma}
+%package numa
+Summary: The Oracle Cluster File System Version 2 for NUMA systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: k_numa = %{kver}
+Requires: ocfs-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description numa
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for NUMA kernels.
+%endif
+
+
+%if %{builditanium2}
+%package itanium2
+Summary: The Oracle Cluster File System Version 2 for UP Itanium2 systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: k_itanium2 = %{kver}
+Requires: ocfs-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description itanium2
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for UP Itanium2 kernels.
+%endif
+
+
+%if %{builditanium2smp}
+%package itanium2-smp
+Summary: The Oracle Cluster File System Version 2 for SMP Itanium2 systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: k_itanium2-smp = %{kver}
+Requires: ocfs-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description itanium2-smp
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for Itanium2 SMP kernels.
+%endif
+
+
+%prep
+%setup -n ocfs2-%{version}
+
+
+%build
+
+%if %{builddeflt}
+KPATH="/usr/src/linux-%{kver}-include/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}-include/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 %{buildpsmp}
+KPATH="/usr/src/linux-%{kver}-include/psmp"
+%configure --with-kernel="${KPATH}"
+cd src
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2" install 
+make clean
+cd ..
+%endif
+
+%if %{buildnuma}
+KPATH="/usr/src/linux-%{kver}-include/numa"
+%configure --with-kernel="${KPATH}"
+cd src
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2" install 
+make clean
+cd ..
+%endif
+
+%if %{builditanium2}
+KPATH="/usr/src/linux-%{kver}-include/itanium2"
+%configure --with-kernel="${KPATH}"
+cd src
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2" install 
+make clean
+cd ..
+%endif
+
+%if %{builditanium2smp}
+KPATH="/usr/src/linux-%{kver}-include/itanium2-smp"
+%configure --with-kernel="${KPATH}"
+cd src
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2" install 
+make clean
+cd ..
+%endif
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+%if %{builddeflt}
+%post deflt
+depmod -a
+
+%files deflt
+%defattr(-,root,root)
+/lib/modules/%{kver}-default/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildsmp}
+%post smp
+depmod -a
+
+%files smp
+%defattr(-,root,root)
+/lib/modules/%{kver}-smp/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildpsmp}
+%post psmp
+depmod -a
+
+%files psmp
+%defattr(-,root,root)
+/lib/modules/%{kver}-psmp/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildnuma}
+%post numa
+depmod -a
+
+%files numa
+%defattr(-,root,root)
+/lib/modules/%{kver}-numa/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{builditanium2}
+%post itanium2
+depmod -a
+
+%files itanium2
+%defattr(-,root,root)
+/lib/modules/%{kver}-itanium2/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{builditanium2smp}
+%post itanium2-smp
+depmod -a
+
+%files itanium2-smp
+%defattr(-,root,root)
+/lib/modules/%{kver}-itanium2-smp/kernel/drivers/addon/ocfs2
+%endif
+
+
+%changelog
+* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
+- Initial rpm spec file



More information about the Ocfs2-commits mailing list