[Oracleasm-commits] jlbec commits r409 - in trunk: . vendor/common
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Jan 15 20:02:37 PST 2009
Author: jlbec
Date: 2009-01-15 20:02:37 -0800 (Thu, 15 Jan 2009)
New Revision: 409
Added:
trunk/vendor/common/binrpm.spec-generic.in
Modified:
trunk/Config.make.in
trunk/configure.in
trunk/kver.m4
trunk/vendor/common/
trunk/vendor/common/Makefile
trunk/vendor/common/Vendor.make
Log:
binrpm-pkg:
The mainline kernel has a target called 'binrpm-pkg'. This package takes
files of a built kernel tree and creates a binary RPM out of them.
This commit adds the 'binrpm-pkg' target to vendor/common/Vendor.make.
The target builds an oracleasm driver RPM out of the compiled local
tree, matching the kernel version found by configure.
Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in 2009-01-08 05:00:39 UTC (rev 408)
+++ trunk/Config.make.in 2009-01-16 04:02:37 UTC (rev 409)
@@ -48,6 +48,7 @@
KERNELDIR = @KERNELDIR@
KERNELINC = $(KERNELDIR)/include
KERNELVER = @KERNELVER@
+KERNELARCH = @KERNELARCH@
BUILD_DRIVER = @BUILD_DRIVER@
else
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2009-01-08 05:00:39 UTC (rev 408)
+++ trunk/configure.in 2009-01-16 04:02:37 UTC (rev 409)
@@ -77,6 +77,7 @@
KBUILDINC="$KERNELDIR/include"
OCFS2_CHECK_KVER($KBUILDINC, kbuildversion, , , :)
+OCFS2_CHECK_KARCH($KBUILDINC, kbuildarch, , , :)
kernelsourcedir=
AC_MSG_CHECKING(for directory with kernel sources)
@@ -168,6 +169,8 @@
KERNELVER=$kversion
AC_SUBST(KERNELVER)
+KERNELARCH=$kbuildarch
+AC_SUBST(KERNELARCH)
KAPI_COMPAT_CFLAGS=
BACKING_DEV_CAPABILITIES=
@@ -304,4 +307,5 @@
vendor/sles10/oracleasm.spec-generic
vendor/rhel5/oracleasm.spec-generic
vendor/common/oracleasm-headers.spec-generic
+vendor/common/binrpm.spec-generic
])
Modified: trunk/kver.m4
===================================================================
--- trunk/kver.m4 2009-01-08 05:00:39 UTC (rev 408)
+++ trunk/kver.m4 2009-01-16 04:02:37 UTC (rev 409)
@@ -51,3 +51,53 @@
[AC_MSG_ERROR([Could not determine kernel$check_kver_DESC version.])])
fi
])# OCFS2_CHECK_KVER
+
+dnl OCFS2_CHECK_KARCH(INCLUDE-PATH, ARCH-VARIABLE, [DESCRIPTION],
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([OCFS2_CHECK_KARCH],
+ [AC_LANG_PREPROC_REQUIRE()dnl
+ AC_REQUIRE([AC_PROG_EGREP])dnl
+
+ check_karch_DESC="$3"
+
+ if test -n "$check_karch_DESC"; then
+ check_karch_DESC=" $check_karch_DESC"
+ fi
+
+ UTS_HEADER=compile.h
+
+ check_karch_saved_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-I$1 $CPPFLAGS -nostdinc"
+
+ AC_MSG_CHECKING(for kernel$check_karch_DESC version)
+
+ AC_LANG_CONFTEST([AC_LANG_SOURCE([
+#include <linux/${UTS_HEADER}>
+
+#ifdef UTS_MACHINE
+check_karch_RESULT=UTS_MACHINE
+#else
+check_karch_RESULT=none
+#endif
+])])
+
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+ $EGREP "^check_karch_RESULT=" > conftest.karch 2>&1; then
+ . ./conftest.karch
+ else
+ check_karch_RESULT='none'
+ fi
+
+ AC_MSG_RESULT($check_karch_RESULT)
+ rm -f conftest*
+
+ CPPFLAGS="$check_karch_saved_CPPFLAGS"
+
+ if test "x$check_karch_RESULT" != "xnone"; then
+ $2=$check_karch_RESULT
+ m4_default([$4], :)
+ else
+ m4_default([$5],
+ [AC_MSG_ERROR([Could not determine kernel$check_karch_DESC version.])])
+ fi
+])# OCFS2_CHECK_KARCH
Property changes on: trunk/vendor/common
___________________________________________________________________
Name: svn:ignore
- .*.sw?
oracleasm-headers.spec
oracleasm-headers.spec-generic
+ .*.sw?
oracleasm-headers.spec
oracleasm-headers.spec-generic
binrpm.spec
binrpm.spec-generic
Modified: trunk/vendor/common/Makefile
===================================================================
--- trunk/vendor/common/Makefile 2009-01-08 05:00:39 UTC (rev 408)
+++ trunk/vendor/common/Makefile 2009-01-16 04:02:37 UTC (rev 409)
@@ -3,6 +3,7 @@
include $(TOPDIR)/Preamble.make
DIST_FILES = \
+ binrpm.spec-generic.in \
oracleasm-headers.spec-generic.in \
Vendor.make
Modified: trunk/vendor/common/Vendor.make
===================================================================
--- trunk/vendor/common/Vendor.make 2009-01-08 05:00:39 UTC (rev 408)
+++ trunk/vendor/common/Vendor.make 2009-01-16 04:02:37 UTC (rev 409)
@@ -28,3 +28,13 @@
headers_rpm: headers_srpm
$(RPMBUILD) --rebuild $(TOOLSARCH) "oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
+#
+# Build a package out of the compiled source tree
+#
+
+$(TOPDIR)/vendor/common/binrpm.spec: $(TOPDIR)/vendor/common/binrpm.spec-generic
+ sed -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
+
+
+binrpm-pkg: $(TOPDIR)/vendor/common/binrpm.spec
+ $(RPMBUILD) --define "_builddir $(TOPDIR)" --target $(KERNELARCH) -bb $<
Added: trunk/vendor/common/binrpm.spec-generic.in
===================================================================
--- trunk/vendor/common/binrpm.spec-generic.in (rev 0)
+++ trunk/vendor/common/binrpm.spec-generic.in 2009-01-16 04:02:37 UTC (rev 409)
@@ -0,0 +1,106 @@
+#
+# Spec file for a pre-built oracleasm
+#
+
+# Macros
+# This one is hardcoded because, well, it belongs there
+%define _prefix /usr
+# Because RPM is dumb
+%define _unpackaged_files_terminate_build 0
+
+# This must be changed to the minimum ABI compat kernel version expected
+%define kver @KERNELVER@
+
+# The minimum -support package required for the kernel bits.
+%define support_ver 2.0.0
+# Minimum oracleasmlib version that supports positive ASM_ERR_NODEV.
+%define min_enodev 2.0.1
+
+Summary: The Oracle Automatic Storage Management library driver.
+Name: oracleasm-%{kver}
+Version: @DIST_VERSION@
+Release: @@PKG_VERSION@@.built
+License: GPL
+Group: System Environment/Kernel
+URL: http://oss.oracle.com/projects/oracleasm/
+Distribution: Oracle
+Vendor: Oracle Corporation
+Packager: Joel Becker <joel.becker at oracle.com>
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+
+BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+
+%description
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is built out of a compiled source tree.
+
+
+%build
+%install
+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}/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+%clean
+#echo rm -rf "$RPM_BUILD_ROOT"
+
+
+%post
+depmod -ae %{kver}
+
+%files
+%defattr(-,root,root)
+/lib/modules/%{kver}/kernel/drivers/addon/oracleasm
+
+
+%changelog
+* Thu Jan 15 2009 Joel Becker <joel.becker at oracle.com>
+- Build a package out of a compiled tree.
+
+* Mon Nov 12 2007 Sunil Mushran <sunil.mushran at oracle.com>
+- Add support to build modules for kernel-debug for RHEL5
+
+* Wed Apr 18 2007 Joel Becker <joel.becker at oracle.com>
+- Add RHEL5
+
+* Fri Feb 09 2007 Joel Becker <joel.becker at oracle.com>
+- Strip down for Fedora Core 6
+
+* Thu May 25 2006 Joel Becker <joel.becker at oracle.com>
+- Add largesmp
+
+* Fri Feb 04 2005 Joel Becker <joel.becker at oracle.com>
+- Make RHEL4 specfile.
+
+* Tue Sep 21 2004 Joel Becker <joel.becker at oracle.com>
+- Make SLES9 specfile.
+
+* Tue Jan 13 2004 Joel Becker <joel.becker at oracle.com>
+- Make kernel-only.
+
+* Thu Nov 20 2003 Joel Becker <joel.becker at oracle.com>
+- Add x86 and ia64 targets.
+
+* Wed Nov 19 2003 Joel Becker <joel.becker at oracle.com>
+- Make the UL SP3 changes.
+
+* Wed Nov 12 2003 Joel Becker <joel.becker at oracle.com>
+- Start the ASM rename.
+
+* Thu Oct 30 2003 Joel Becker <joel.becker at oracle.com>
+- Created EL3 version
+
+* Mon Jun 23 2003 Joel Becker <joel.becker at oracle.com>
+- Added osm-lib bits
+
+* Fri Jun 20 2003 Joel Becker <joel.becker at oracle.com>
+- Initial RPM
+
More information about the Oracleasm-commits
mailing list