[Ocfs2-commits] manish commits r1464 - in trunk: . vendor
vendor/suse
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Sep 13 16:49:11 CDT 2004
Author: manish
Date: 2004-09-13 16:49:09 -0500 (Mon, 13 Sep 2004)
New Revision: 1464
Added:
trunk/vendor/suse/
trunk/vendor/suse/Makefile
trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
Modified:
trunk/configure.in
trunk/vendor/Makefile
Log:
Add SLES9 rpm support, and an attempt to guess suse kernel source trees
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2004-09-13 20:50:05 UTC (rev 1463)
+++ trunk/configure.in 2004-09-13 21:49:09 UTC (rev 1464)
@@ -123,13 +123,13 @@
AC_MSG_RESULT($enable_largeio)
AC_MSG_CHECKING(for directory with kernel build tree)
-AC_ARG_WITH(kernel, [ --with-kernel=dir Path to the kernel build tree [[/usr/src/linux]]], kerneldir="$withval",
+AC_ARG_WITH(kernel, [ --with-kernel=dir Path to the kernel build tree [[/usr/src/linux]]], kerneldir="$withval", [
if test -d "/lib/modules/`uname -r`/build" -o -L "/lib/modules/`uname -r`/build"; then
kerneldir="/lib/modules/`uname -r`/build"
else
kerneldir="/usr/src/linux"
fi
-)
+])
AC_MSG_RESULT($kerneldir)
KERNELDIR=$kerneldir
@@ -141,12 +141,6 @@
AC_MSG_ERROR(No configured kernel include tree found)
fi
-AC_MSG_CHECKING(for directory with kernel source)
-AC_ARG_WITH(kernel-source, [ --with-kernel-source=dir Path to the kernel source [[same as kernel build tree]]], kernelsrc="$withval", kernelsrc="$kerneldir")
-AC_MSG_RESULT($kernelsrc)
-
-KERNELSRC=$kernelsrc
-
saved_CPPFLAGS="$CPPFLAGS"
saved_CFLAGS="$CFLAGS"
@@ -197,6 +191,23 @@
KERNELVER=$kversion
AC_SUBST(KERNELVER)
+AC_MSG_CHECKING(for directory with kernel source)
+AC_ARG_WITH(kernel-source, [ --with-kernel-source=dir Path to the kernel source [[autodetect]]], kernelsrc="$withval", [
+ if test -r /etc/UnitedLinux-release -o -r /etc/SuSE-release ; then
+ guesskver=`echo "$kversion" | sed 's/-[[^-]]*$//'`
+ if test -d "/usr/src/linux-${guesskver}"; then
+ kernelsrc="/usr/src/linux-${guesskver}"
+ else
+ kernelsrc="$kerneldir"
+ fi
+ else
+ kernelsrc="$kerneldir"
+ fi
+])
+AC_MSG_RESULT($kernelsrc)
+
+KERNELSRC=$kernelsrc
+
AC_MSG_CHECKING([for Red Hat kernel])
AC_EGREP_CPP(kernel_is_Red_Hat,
[#include <linux/autoconf.h>
@@ -321,4 +332,5 @@
AC_OUTPUT([Config.make
vendor/redhat/ocfs2-2.4.21-EL.spec
vendor/unitedlinux/ocfs2-2.4.21.spec-generic
+vendor/suse/ocfs2-2.6.5.spec-generic
])
Modified: trunk/vendor/Makefile
===================================================================
--- trunk/vendor/Makefile 2004-09-13 20:50:05 UTC (rev 1463)
+++ trunk/vendor/Makefile 2004-09-13 21:49:09 UTC (rev 1464)
@@ -2,6 +2,6 @@
include $(TOPDIR)/Preamble.make
-SUBDIRS = redhat unitedlinux
+SUBDIRS = redhat unitedlinux suse
include $(TOPDIR)/Postamble.make
Added: trunk/vendor/suse/Makefile
===================================================================
--- trunk/vendor/suse/Makefile 2004-09-13 20:50:05 UTC (rev 1463)
+++ trunk/vendor/suse/Makefile 2004-09-13 21:49:09 UTC (rev 1464)
@@ -0,0 +1,8 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+DIST_FILES = \
+ ocfs2-2.6.5.spec-generic.in
+
+include $(TOPDIR)/Postamble.make
Added: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in 2004-09-13 20:50:05 UTC (rev 1463)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in 2004-09-13 21:49:09 UTC (rev 1464)
@@ -0,0 +1,419 @@
+#
+# Spec file for OCFS2 on SLES9
+#
+
+# 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 builddefault 1
+%define buildsmp 1
+%define build64kpagesize 0
+%define buildsn2 0
+%define buildiseries64 0
+%define buildpmac64 0
+%define buildpseries64 0
+%define builds390 0
+%define builds390x 0
+
+%ifarch ia64
+%define buildsmp 0
+%define build64kpagesize 1
+%define buildsn2 1
+%endif
+
+%ifarch ppc
+%define buildiseries64 1
+%define buildpmac64 1
+%define buildpseries64 1
+%endif
+
+%ifarch s390
+%define builddefault 0
+%define buildsmp 0
+%define builds390 1
+%endif
+
+%ifarch s390x
+%define builddefault 0
+%define buildsmp 0
+%define builds390x 1
+%endif
+
+
+
+# This must be changed to the minimum ABI compat kernel version expected
+%define base 2.6.5
+%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: kernel-default = %{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 the default kernel.
+
+%if %{builddefault}
+%package default
+Summary: The Oracle Cluster File System Version 2 for UP systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: ocfs2 = %{version}
+Requires: kernel-default = %{kver}
+Requires: ocfs2-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: kernel-smp = %{kver}
+Requires: ocfs2-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 %{build64kpagesize}
+%package 64k-pagesize
+Summary: The Oracle Cluster File System Version 2 for Itanium 64k pagesize systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-64k-pagesize = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description 64k-pagesize
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-sn2 = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description sn2
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-iseries64 = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description iseries64
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-pmac64 = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description pmac64
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-pseries64 = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description pseries64
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-s390 = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description s390
+The Oracle Cluster Filesystem Version 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.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel-s390x = %{kver}
+Requires: ocfs2-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}
+
+%description s390x
+The Oracle Cluster Filesystem Version 2.
+This package is compiled for zSeries kernels.
+%endif
+
+
+%prep
+%setup -n ocfs2-%{version}
+
+
+%build
+
+%if %{builddefault}
+KPATH="/usr/src/linux-%{kver}-obj/%{arch}/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/%{arch}/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 %{build64kpagesize}
+KPATH="/usr/src/linux-%{kver}-obj/%{arch}/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/%{arch}/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/%{arch}/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/%{arch}/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/%{arch}/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/%{arch}/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/%{arch}/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
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+%if %{builddefault}
+%post default
+depmod -a
+
+%files default
+%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 %{build64kpagesize}
+%post 64k-pagesize
+depmod -a
+
+%files 64k-pagesize
+%defattr(-,root,root)
+/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildsn2}
+%post sn2
+depmod -a
+
+%files sn2
+%defattr(-,root,root)
+/lib/modules/%{kver}-sn2/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildiseries64}
+%post iseries64
+depmod -a
+
+%files iseries64
+%defattr(-,root,root)
+/lib/modules/%{kver}-iseries64/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildpmac64}
+%post pmac64
+depmod -a
+
+%files pmac64
+%defattr(-,root,root)
+/lib/modules/%{kver}-pmac64/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{buildpseries64}
+%post pseries64
+depmod -a
+
+%files pseries64
+%defattr(-,root,root)
+/lib/modules/%{kver}-pseries64/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{builds390}
+%post s390
+depmod -a
+
+%files s390
+%defattr(-,root,root)
+/lib/modules/%{kver}-s390/kernel/drivers/addon/ocfs2
+%endif
+
+
+%if %{builds390x}
+%post s390x
+depmod -a
+
+%files s390x
+%defattr(-,root,root)
+/lib/modules/%{kver}-s390x/kernel/drivers/addon/ocfs2
+%endif
+
+
+%changelog
+* Mon Sep 13 2004 Manish Singh <manish.singh at oracle.com>
+- Initial rpm spec file
More information about the Ocfs2-commits
mailing list