[Oracleasm-commits] jlbec commits r349 - in trunk: . tools vendor/common vendor/rhas21 vendor/rhel3 vendor/rhel4 vendor/sles8 vendor/sles9
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Thu Jul 6 02:46:14 CDT 2006
Author: jlbec
Date: 2006-07-06 02:42:20 -0500 (Thu, 06 Jul 2006)
New Revision: 349
Removed:
trunk/include/
trunk/kapi-compat/
trunk/kernel/
trunk/kfeature.m4
trunk/vendor/rhel4/kernel.guess
trunk/vendor/rhel4/oracleasm.spec-generic.in
trunk/vendor/sles9/kernel.guess
trunk/vendor/sles9/oracleasm.spec-generic.in
Modified:
trunk/Config.make.in
trunk/Makefile
trunk/Postamble.make
trunk/Preamble.make
trunk/README
trunk/aclocal.m4
trunk/configure.in
trunk/tools/Makefile
trunk/tools/asmscan.c
trunk/tools/asmtool.c
trunk/vendor/common/Vendor.make
trunk/vendor/common/oracleasm-support.spec-generic.in
trunk/vendor/rhas21/Vendor.make
trunk/vendor/rhel3/Vendor.make
trunk/vendor/rhel4/Makefile
trunk/vendor/rhel4/Vendor.make
trunk/vendor/sles8/Vendor.make
trunk/vendor/sles9/Makefile
trunk/vendor/sles9/Vendor.make
Log:
Major rework:
- oracleasm-support now has its own repository
- Remove the driver bits
- Detect the driver ABI headers, expecting them to live in /usr/include
unless specified with --with-oracleasm
- Make the specfile depend on oracleasm-headers, remove
ORACLEASMDIR_OVERRIDE
- Latest makebo bits
Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/Config.make.in 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,4 +1,3 @@
-ifeq ($(KERNELRELEASE),)
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -18,16 +17,19 @@
bindir = @bindir@
sbindir = @sbindir@
+libdir = @libdir@
+includedir = @includedir@
+datarootdir = @datarootdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
mandir = @mandir@
-datarootdir = @datarootdir@
top_builddir = .
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_HEADER = @INSTALL_DATA@
LN_S = @LN_S@
@@ -40,19 +42,13 @@
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
+NO_POINTER_SIGN = @NO_POINTER_SIGN@
+
DEFS = @DEFS@
USERM64 = @USERM64@
-KERNELDIR = @KERNELDIR@
-KERNELINC = $(KERNELDIR)/include
-KERNELVER = @KERNELVER@
-BUILD_DRIVER = @BUILD_DRIVER@
-else
+ORACLEASM_INCLUDE = @ORACLEASM_INCLUDE@
+ORACLEASM_OLD_HEADERS = @ORACLEASM_OLD_HEADERS@
-BACKING_DEV_CAPABILITIES = @BACKING_DEV_CAPABILITIES@
-GET_SB_HAS_VFSMOUNT = @GET_SB_HAS_VFSMOUNT@
-EXTRA_CFLAGS += @KAPI_COMPAT_CFLAGS@
-
-endif
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/Makefile 2006-07-06 07:42:20 UTC (rev 349)
@@ -14,11 +14,8 @@
#
# Add any directories to recurse into via the SUBDIRS variable.
#
-SUBDIRS = include kernel tools documents vendor
+SUBDIRS = tools documents vendor
-KAPI_COMPAT_FILES = \
- kapi-compat/include/i_mutex.h
-
#
# Extra (non-source) files to distribute
#
@@ -30,7 +27,6 @@
Preamble.make \
Postamble.make \
aclocal.m4 \
- kfeature.m4 \
mbvendor.m4 \
config.guess \
config.sub \
@@ -40,14 +36,9 @@
mkinstalldirs \
svnrev.guess \
Vendor.make \
- vendor.guess \
- $(KAPI_COMPAT_FILES)
+ vendor.guess
-DIST_RULES = dist-subdircreate
-dist-subdircreate:
- $(TOPDIR)/mkinstalldirs $(DIST_DIR)/kapi-compat/include
-
include Vendor.make
Modified: trunk/Postamble.make
===================================================================
--- trunk/Postamble.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/Postamble.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -54,18 +54,46 @@
$(MAKE) -C $@
.PHONY: all-rules
-all-rules: subdirs $(LIBRARIES) $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(UNINST_PROGRAMS) $(MODULES) $(MANS) $(ALL_RULES)
+all-rules: subdirs $(UNINST_LIBRARIES) $(LIBRARIES) $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(UNINST_PROGRAMS) $(MODULES) $(MANS)
INSTALL_SUBDIRS = $(addsuffix -install,$(SUBDIRS))
-.PHONY: install-rules install-subdirs $(INSTALL_RULES) install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra
+.PHONY: install-rules install-subdirs $(INSTALL_RULES) install-libraries install-headers install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra
install-subdirs: $(INSTALL_SUBDIRS)
$(INSTALL_SUBDIRS):
$(MAKE) -C $(subst -install,,$@) install
+install-libraries: $(LIBRARIES)
+ifdef LIBRARIES
+ $(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(libdir)
+ for lib in $(LIBRARIES); do \
+ $(INSTALL_LIBRARY) $$lib $(DESTDIR)$(libdir)/$$lib; \
+ done
+endif
+
+ifeq ($(filter /%,$(HEADERS_SUBDIR)),)
+Hsubdir = /$(HEADERS_SUBDIR)
+else
+Hsubdir = $(HEADERS_SUBDIR)
+endif
+
+ifeq ($(filter include/%,$(HEADERS)),)
+Hinstall =
+else
+Hinstall = include/
+endif
+
+install-headers: $(HEADERS)
+ifdef HEADERS
+ $(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(includedir)$(Hsubdir)
+ for hdr in $(patsubst include/%,%,$(HEADERS)); do \
+ $(INSTALL_HEADER) $(Hinstall)$$hdr $(DESTDIR)$(includedir)$(Hsubdir)/$$hdr; \
+ done
+endif
+
install-bin-programs: $(BIN_PROGRAMS)
ifdef BIN_PROGRAMS
$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(bindir)
@@ -108,7 +136,7 @@
done
endif
-install-rules: install-subdirs $(INSTALL_RULES) install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra install-mans
+install-rules: install-subdirs $(INSTALL_RULES) install-libraries install-headers install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra install-mans
CLEAN_SUBDIRS = $(addsuffix -clean,$(SUBDIRS))
@@ -121,7 +149,7 @@
$(MAKE) -C $(subst -clean,,$@) clean
clean: clean-subdirs $(CLEAN_RULES)
- rm -f *.o *.p .*.d core $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(LIBRARIES) $(CLEAN_FILE) stamp-md5
+ rm -f *.o *.p .*.d core $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(UNINST_PROGRAMS) $(LIBRARIES) $(UNINST_LIBRARIES) $(CLEAN_FILES) stamp-md5
DIST_SUBDIRS = $(addsuffix -dist,$(SUBDIRS))
@@ -160,6 +188,7 @@
distclean: clean
rm -f Config.make config.status config.cache config.log
+
LOCAL_DFILES := $(wildcard .*.d)
ifneq ($(LOCAL_DFILES),)
.PHONY: $(LOCAL_DFILES)
Modified: trunk/Preamble.make
===================================================================
--- trunk/Preamble.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/Preamble.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -7,11 +7,16 @@
endif
LIBRARIES =
-PROGRAMS =
+UNINST_LIBRARIES =
+BIN_PROGRAMS =
+SBIN_PROGRAMS =
+UNINST_PROGRAMS =
MODULES =
+HEADERS =
MANS =
-ALL_RULES =
+HEADERS_SUBDIR =
+
INSTALL_RULES =
CLEAN_FILES =
Modified: trunk/README
===================================================================
--- trunk/README 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/README 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,46 +1,16 @@
-First things first.
+[Oracle Linux ASMLib]
-!!!! DO NOT RUN THE TESTS WITHOUT CHECKING YOUR DISKS !!!!
+ This package contains the support tools for Oracle's Generic Linux
+ASMLib. This includes utilities to allocate, deallocate, and scan disks
+for ASMLib, as well as boot-time startup utilities.
+ You will need the driver package appropriate for your kernel and
+the actual ASMLib library to use this software. Packages are available
+on the Oracle Technology Network (http://otn.oracle.com/tech/linux/asmlib/).
+ To compile, you will need the ABI headers from the driver package.
+You may have installed them with the driver, or you may point the
+configure script to your driver source tree with the --with-oracleasm
+option.
+ Run the configure script, then run make.
- The asmtest and asmtest-multi checks write to the last 10MB or
-so of a specified disk. They take an argument of the disk to write to.
-Do not destroy your data.
-
-
-Second things later.
-
- Building ASMlib requires a quick run of the configure script
-in the toplevel directory. It will ask the location to the includes for
-your kernel. This code currently only supports Linux 2.6. You then can
-run a make.
- Testing ASMlib is pretty easy. First, install and mount the
-filesystem:
-
- # mkdir /dev/oracleasm
- # insmod kernel/oracleasm.ko
- # mount -t oracleasmfs oracleasmfs /dev/oracleasm
-
- Next, you have to mark disks as candidates for ASM. asmtool is
-the tool for this. It exists in the tools/ subdirectory. eg:
-
- # tools/asmtool -m /dev/sdf5
-
- Now you can then either use 10i or the test programs to try
-things out. Have fun. Report bugs.
-
-
-Third things fourth.
-
- There isn't an easy way to determine the maximum I/O a
-particular device can handle dynamically. The current code takes the
-least common denominator and reports the maximum I/O as the maximum of
-the smallest card (the MegaRAID).
- Also note that while in good cases the maximum I/O will go out
-as one SCSI command, errors can cause it to break up. These can be
-hardware and are not really predictable. Low memory situations (where a
-large scatter/gather list cannot be allocated) also relax this
-assurance. But, if no error occurs on the disk and there is enough
-memory, the I/O goes out all together.
-
Joel Becker <joel.becker at oracle.com>
Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/aclocal.m4 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,2 +1 @@
-m4_include([kfeature.m4])
m4_include([mbvendor.m4])
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/configure.in 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,6 +1,7 @@
AC_INIT(Makefile)
-PACKAGE=oracleasm
+PACKAGE=oracleasm-support
+PACKAGE_ABI_VERSION=2
AC_SUBST(PACKAGE)
@@ -16,10 +17,10 @@
# INTEFACE_AGE to 0.
#
MAJOR_VERSION=2
-MINOR_VERSION=0
-MICRO_VERSION=3
-INTERFACE_AGE=3
-BINARY_AGE=3
+MINOR_VERSION=1
+MICRO_VERSION=0
+INTERFACE_AGE=0
+BINARY_AGE=0
VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
@@ -42,10 +43,30 @@
AC_PATH_PROG(AR, ar)
-
AC_HEADER_STDC
AC_C_CONST
+saved_CPPFLAGS="$CPPFLAGS"
+saved_CFLAGS="$CFLAGS"
+
+#
+# ASMLib uses oratypes. oratypes defines strings as "unsigned char".
+# str*() uses "char". So let's not spew warnings.
+#
+AC_MSG_CHECKING(for -Wno-pointer-sign)
+CFLAGS="$CFLAGS -Wno-pointer-sign"
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[]],[[]])],
+ [NO_POINTER_SIGN=-Wno-pointer-sign
+ AC_MSG_RESULT([-Wno-pointer-sign])],
+ [NO_POINTER_SIGN=
+ AC_MSG_RESULT([not supported])]
+)
+AC_SUBST(NO_POINTER_SIGN)
+
+CPPFLAGS="$saved_CPPFLAGS"
+CFLAGS="$saved_CFLAGS"
+
AC_ARG_ENABLE(force32,
[ --enable-force32 Force building a 32bit library on a 64bit platform],
force32="$enableval",
@@ -58,7 +79,7 @@
yes|true|on)
;;
*)
- USERM64="$M64"
+ USERM64="-m64"
;;
esac
;;
@@ -68,124 +89,65 @@
AC_SUBST(USERM64)
+saved_CPPFLAGS="$CPPFLAGS"
+saved_CFLAGS="$CFLAGS"
+
+CFLAGS="$CFLAGS $USERM64"
AC_CHECK_SIZEOF(unsigned long)
+CPPFLAGS="$saved_CPPFLAGS"
+CFLAGS="$saved_CFLAGS"
+
MB_VENDOR()
-MB_VENDOR_KERNEL(vendordir)
-if test "x$GCC" != "xyes"; then
- AC_MSG_ERROR(GCC is required)
+AC_ARG_WITH(oracleasm, [ --with-oracleasm=dir Path to the oracleasm source tree []],
+ ORACLEASM_INCLUDE="${withval}/include", ORACLEASM_INCLUDE="")
+
+saved_CPPFLAGS="$CPPFLAGS"
+if test x"$ORACLEASM_INCLUDE" != x; then
+ CPPFLAGS="$CPPFLAGS -I$ORACLEASM_INCLUDE -DSIZEOF_UNSIGNED_LONG=$ac_cv_sizeof_unsigned_long"
fi
-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", [
- if test -n "$vendordir"; then
- kerneldir="$vendordir"
- elif 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
+ORACLEASM_OLD_HEADERS=
+AC_CHECK_HEADER(linux/oracleasm/abi.h, :, [
+ AC_CHECK_HEADER(linux/asmabi.h, ORACLEASM_OLD_HEADERS=yes,
+ AC_MSG_ERROR([Unable to find ABI header]), [
+ #include <linux/types.h>
+ #include <linux/asmcompat32.h>
+ ])], [
+ #include <linux/types.h>
+ #include <linux/oracleasm/compat32.h>
])
-if test ! -f "${kerneldir}/include/linux/autoconf.h"; then
- AC_MSG_RESULT([not found])
- KERNELDIR=
+if test x"$ORACLEASM_OLD_HEADERS" != x"yes"; then
+ HEADERS="#include <linux/types.h>
+#include <linux/oracleasm/compat32.h>
+#include <linux/oracleasm/abi.h>"
else
- AC_MSG_RESULT($kerneldir)
- KERNELDIR="$kerneldir"
- AC_SUBST(KERNELDIR)
+ HEADERS="#include <linux/types.h>
+#include <linux/asmcompat32.h>
+#include <linux/asmabi.h>"
fi
-AC_MSG_CHECKING(for kernel version)
-if test -n "$KERNELDIR"; then
- kernelinc="${KERNELDIR}/include"
+AC_MSG_CHECKING(ABI version)
+AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[$HEADERS]],[[
+ #if ASM_ABI_VERSION != $PACKAGE_ABI_VERSION
+ # error Unmatched ABI version
+ #endif
+ ]])],
+ [AC_MSG_RESULT([$PACKAGE_ABI_VERSION])],
+ [AC_MSG_RESULT(different)
+ AC_MSG_ERROR(ASM ABI differs between package and headers)]
+)
- saved_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-I${kernelinc} $CPPFLAGS"
- saved_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $M64"
-
-
- rm -f conf.kvertest
- AC_TRY_RUN([
-#include <stdio.h>
-#include <linux/version.h>
-
-int
-main (void)
-{
-#ifdef UTS_RELEASE
- FILE *f;
- f = fopen ("conf.kvertest", "w");
- if (!f)
- return 1;
- fprintf (f, "%s", UTS_RELEASE);
- fclose (f);
- return 0;
-#else
- return 1;
-#endif
-}],kversion=`cat conf.kvertest`, kversion="none")
- rm -f conf.kvertest
-
+if test x"$ORACLEASM_INCLUDE" != x; then
CPPFLAGS="$saved_CPPFLAGS"
- CFLAGS="$saved_CFLAGS"
-else
- kversion="none"
fi
-BUILD_DRIVER=
-case "$kversion" in
- 2.6.*)
- AC_MSG_RESULT($kversion)
- BUILD_DRIVER=yes
- ;;
- none)
- AC_MSG_RESULT([Could not determine kernel version, disabling driver build])
- ;;
- *)
- AC_MSG_RESULT([This module only supports kernel version 2.6.x, disabling driver build])
- ;;
-esac
-AC_SUBST(BUILD_DRIVER)
+AC_SUBST(ORACLEASM_INCLUDE)
+AC_SUBST(ORACLEASM_OLD_HEADERS)
-KERNELVER=$kversion
-AC_SUBST(KERNELVER)
-
-KAPI_COMPAT_CFLAGS=
-BACKING_DEV_CAPABILITIES=
-GET_SB_HAS_VFSMOUNT=
-if test x"$BUILD_DRIVER" = "xyes"; then
- KERNELINC="${KERNELDIR}/include" # Needed by kfeature.m4
- KAPI_COMPAT_HEADERS=
-
- OCFS2_CHECK_KERNEL([capabilities mask in backing_dev_info], backing-dev.h,
- BACKING_DEV_CAPABILITIES=yes, , [\<BDI_CAP_NO_WRITEBACK\>])
-
- OCFS2_CHECK_KERNEL([vfsmount in ->get_sb() helpers], fs.h,
- GET_SB_HAS_VFSMOUNT=yes, , [^extern int get_sb_pseudo])
-
- mutex_compat_header=
- OCFS2_CHECK_KERNEL([for mutex API], mutex.h, ,
- mutex_compat_header="i_mutex.h", [mutex_lock])
- KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $mutex_compat_header"
-
- # using -include has two advantages:
- # the source doesn't need to know to include compat headers
- # the compat header file names don't go through the search path
- for h in $KAPI_COMPAT_HEADERS; do
- KAPI_COMPAT_CFLAGS="$KAPI_COMPAT_CFLAGS -include \$(OUR_TOPDIR)/kapi-compat/include/$h"
- done
-fi
-AC_SUBST(KAPI_COMPAT_CFLAGS)
-AC_SUBST(BACKING_DEV_CAPABILITIES)
-AC_SUBST(GET_SB_HAS_VFSMOUNT)
-
-
AC_OUTPUT([Config.make
-include/linux/asm_module_version.h
-vendor/common/oracleasm-support.spec-generic
-vendor/sles9/oracleasm.spec-generic
-vendor/rhel4/oracleasm.spec-generic
+vendor/common/${PACKAGE}.spec-generic
])
Deleted: trunk/kfeature.m4
===================================================================
--- trunk/kfeature.m4 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/kfeature.m4 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,21 +0,0 @@
-AC_DEFUN([OCFS2_CHECK_KERNEL],
- [AC_MSG_CHECKING([for $1])
- kernel_check_regexp="m4_default([$5], [\<$1(])"
-
- kernel_check_headers=
- for kfile in $2; do
- kernel_check_headers="$kernel_check_headers $KERNELINC/linux/$kfile"
- done
-
- if grep "$kernel_check_regexp" $kernel_check_headers >/dev/null 2>&1 ; then
- m4_default([$3], :)
- AC_MSG_RESULT(yes)
- else
- m4_default([$4], :)
- AC_MSG_RESULT(no)
- fi
-])# OCFS2_CHECK_KERNEL
-
-AC_DEFUN([OCFS2_KERNEL_COMPAT],
- [OCFS2_CHECK_KERNEL($1, $2, ,
- [KAPI_COMPAT_HEADERS="$KAPI_COMPAT_HEADERS $1.h"])])
Modified: trunk/tools/Makefile
===================================================================
--- trunk/tools/Makefile 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/tools/Makefile 2006-07-06 07:42:20 UTC (rev 349)
@@ -6,22 +6,26 @@
VERSION_FLAGS = -DVERSION="\"${VERSION}\""
CPPFLAGS += -DLINUX ${VERSION_FLAGS} $(DEFS)
-CFLAGS += -Wall $(USERM64)
+CFLAGS += -Wall $(NO_POINTER_SIGN) $(USERM64)
-INCLUDES = -I. -I$(TOPDIR)/include
+ifdef ORACLEASM_OLD_HEADERS
+CPPFLAGS += -DORACLEASM_OLD_HEADERS
+endif
+INCLUDES = -I.
+ifdef ORACLEASM_INCLUDE
+INCLUDES += -I$(ORACLEASM_INCLUDE)
+endif
+
ASMTOOL_SOURCES = asmtool.c devmap.c
ASMSCAN_SOURCES = asmscan.c
-LOCAL_HEADERS = list.h devmap.h
-HEADERS = \
- $(TOPDIR)/include/linux/asmdisk.h \
- $(TOPDIR)/include/linux/asmmanager.h
+UNINST_HEADERS = list.h devmap.h
ASMTOOL_OBJECTS = $(subst .c,.o,$(ASMTOOL_SOURCES))
ASMSCAN_OBJECTS = $(subst .c,.o,$(ASMSCAN_SOURCES))
-DIST_FILES = $(ASMTOOL_SOURCES) $(ASMSCAN_SOURCES) $(LOCAL_HEADERS) \
+DIST_FILES = $(ASMTOOL_SOURCES) $(ASMSCAN_SOURCES) $(UNINST_HEADERS) \
oracleasm_debug_link
INSTALL_RULES += install-debug-link
Modified: trunk/tools/asmscan.c
===================================================================
--- trunk/tools/asmscan.c 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/tools/asmscan.c 2006-07-06 07:42:20 UTC (rev 349)
@@ -52,11 +52,19 @@
#include <linux/types.h>
#include <linux/hdreg.h>
-#include "linux/asmcompat32.h"
-#include "linux/asmabi.h"
-#include "linux/asmdisk.h"
-#include "linux/asmmanager.h"
+#ifndef ORACLEASM_OLD_HEADERS
+# include "linux/oracleasm/compat32.h"
+# include "linux/oracleasm/abi.h"
+# include "linux/oracleasm/disk.h"
+# include "linux/oracleasm/manager.h"
+#else
+# include "linux/asmcompat32.h"
+# include "linux/asmabi.h"
+# include "linux/asmdisk.h"
+# include "linux/asmmanager.h"
+#endif
+
#include "list.h"
Modified: trunk/tools/asmtool.c
===================================================================
--- trunk/tools/asmtool.c 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/tools/asmtool.c 2006-07-06 07:42:20 UTC (rev 349)
@@ -48,11 +48,19 @@
#include <errno.h>
#include <linux/types.h>
-#include "linux/asmcompat32.h"
-#include "linux/asmabi.h"
-#include "linux/asmdisk.h"
-#include "linux/asmmanager.h"
+#ifndef ORACLEASM_OLD_HEADERS
+# include "linux/oracleasm/compat32.h"
+# include "linux/oracleasm/abi.h"
+# include "linux/oracleasm/disk.h"
+# include "linux/oracleasm/manager.h"
+#else
+# include "linux/asmcompat32.h"
+# include "linux/asmabi.h"
+# include "linux/asmdisk.h"
+# include "linux/asmmanager.h"
+#endif
+
#include "list.h"
#include "devmap.h"
Modified: trunk/vendor/common/Vendor.make
===================================================================
--- trunk/vendor/common/Vendor.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/common/Vendor.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -9,12 +9,12 @@
RPM_TOPDIR = `pwd`
$(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(PKG_VERSION).src.rpm: dist $(TOPDIR)/vendor/common/oracleasm-support.spec-generic
- sed -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < "$(TOPDIR)/vendor/common/oracleasm-support.spec-generic" > "$(TOPDIR)/vendor/common/oracleasm-support.spec"
+ sed -e 's,@@PKG_VERSION@@,'$(PKG_VERSION)',' < "$(TOPDIR)/vendor/common/oracleasm-support.spec-generic" > "$(TOPDIR)/vendor/common/oracleasm-support.spec"
$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" "$(TOPDIR)/vendor/common/oracleasm-support.spec"
rm "$(TOPDIR)/vendor/common/oracleasm-support.spec"
-support_srpm: $(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(PKG_VERSION).src.rpm
+srpm: $(TOPDIR)/oracleasm-support-$(DIST_VERSION)-$(PKG_VERSION).src.rpm
-support_rpm: support_srpm
+rpm: srpm
$(RPMBUILD) --rebuild $(TOOLSARCH) "oracleasm-support-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
Modified: trunk/vendor/common/oracleasm-support.spec-generic.in
===================================================================
--- trunk/vendor/common/oracleasm-support.spec-generic.in 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/common/oracleasm-support.spec-generic.in 2006-07-06 07:42:20 UTC (rev 349)
@@ -19,15 +19,16 @@
Release: @@PKG_VERSION@@
Copyright: GPL
Group: System Environment/Kernel
-Source: oracleasm- at DIST_VERSION@.tar.gz
+Source: oracleasm-support- at DIST_VERSION@.tar.gz
URL: http://oss.oracle.com/projects/oracleasm/
Distribution: Oracle
Vendor: Oracle Corporation
Packager: Joel Becker <joel.becker at oracle.com>
AutoReqProv: no
+BuildRequires: oracleasm-headers
-BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+BuildRoot: %{_tmppath}/oracleasm-support-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
@@ -36,7 +37,7 @@
%prep
-%setup -n oracleasm-%{version}
+%setup -n oracleasm-support-%{version}
%build
@@ -56,9 +57,7 @@
--infodir=%{_infodir} \
--sbindir=/usr/sbin
-cd tools
make
-cd ..
@@ -69,7 +68,6 @@
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
cp -f vendor/common/oracleasm.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/oracleasm
-cd tools
make DESTDIR="$RPM_BUILD_ROOT" install
Modified: trunk/vendor/rhas21/Vendor.make
===================================================================
--- trunk/vendor/rhas21/Vendor.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/rhas21/Vendor.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -6,4 +6,4 @@
include $(TOPDIR)/vendor/common/Vendor.make
-packages: support_rpm
+packages: rpm
Modified: trunk/vendor/rhel3/Vendor.make
===================================================================
--- trunk/vendor/rhel3/Vendor.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/rhel3/Vendor.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -6,4 +6,4 @@
include $(TOPDIR)/vendor/common/Vendor.make
-packages: support_rpm
+packages: rpm
Modified: trunk/vendor/rhel4/Makefile
===================================================================
--- trunk/vendor/rhel4/Makefile 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/rhel4/Makefile 2006-07-06 07:42:20 UTC (rev 349)
@@ -3,8 +3,6 @@
include $(TOPDIR)/Preamble.make
DIST_FILES = \
- oracleasm.spec-generic.in \
- kernel.guess \
rpmarch.guess \
Vendor.make \
vendor.guess
Modified: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/rhel4/Vendor.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -3,29 +3,7 @@
#
TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess tools $(TOPDIR))
-MODULEARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess module $(TOPDIR))
-$(TOPDIR)/vendor/rhel4/oracleasm-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm.spec-generic
- SPECVER="$@"; \
- SPECVER="$${SPECVER#*oracleasm-}"; \
- 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}'/' < $< > $@
-
-rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-%.spec
- rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-$(patsubst rhel4_%_srpm,%,$@).spec
-
-rhel4_%_rpm: rhel4_%_srpm
- rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst rhel4_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
-
-
include $(TOPDIR)/vendor/common/Vendor.make
-packages: $(shell $(TOPDIR)/vendor/rhel4/kernel.guess targets) support_rpm
+packages: rpm
Deleted: trunk/vendor/rhel4/kernel.guess
===================================================================
--- trunk/vendor/rhel4/kernel.guess 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/rhel4/kernel.guess 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,247 +0,0 @@
-#!/bin/sh
-
-
-RHEL4_KERNEL_BASE="/usr/src/kernels"
-
-#
-# This is a simple mapping of architectures to kernel flavors. One
-# entry per architecture, <arch>:<flavor1>[,<flavor> ...]
-#
-# This is used when detecting kernels to build packages for. A kernel
-# is only built if build trees for all flavors are installed.
-#
-# Unique to redhat, empty types (the 'default' kernel) are allowed.
-# Be careful parsing this!
-#
-# Red Hat throws us another loop. 2.6.9-34.EL+ have a new "largesmp"
-# type. So, we have TYPES and OLD TYPES.
-#
-RHEL4_KERNEL_TYPES="
- i686:,smp,hugemem
- x86_64:,smp,largesmp
- ia64:,largesmp
- ppc64:,largesmp
- s390x:
-"
-
-
-
-guess_rhel4_arch()
-{
- # This appears to DTRT (i686 on x86, ppc64 on pSeries).
- uname -m
-}
-
-guess_rhel4_type()
-{
- case "$1" in
- *largesmp)
- echo "largesmp"
- ;;
- *hugemem)
- echo "hugemem"
- ;;
- *smp)
- echo "smp"
- ;;
- *)
- echo ""
- ;;
- esac
-}
-
-guess_rhel4_dir()
-{
- KVER="$1"
-
- DIRTYPE=$(guess_rhel4_type "$KVER")
- ARCH=$(guess_rhel4_arch)
-
- if [ -z "$DIRTYPE" ]
- then
- echo "${1%${DIRTYPE}}-${ARCH}"
- else
- echo "${1%${DIRTYPE}}-${DIRTYPE}-${ARCH}"
- fi
-}
-
-verfromdir()
-{
- TESTDIR="$1"
- if [ -r "${TESTDIR}/include/linux/version.h" ]
- then
- awk '/UTS_RELEASE/{gsub(/"/,"",$3); print $3}' "${TESTDIR}/include/linux/version.h"
- fi
-}
-
-validate_dir()
-{
- KVER="$1"
- DIR="$2"
-
- if [ ! -d "${RHEL4_KERNEL_BASE}/${DIR}" ]
- then
- return 1
- elif [ ! -f "${RHEL4_KERNEL_BASE}/${DIR}/include/linux/autoconf.h" ]
- then
- return 1
- elif [ ! -f "${RHEL4_KERNEL_BASE}/${DIR}/include/linux/version.h" ]
- then
- return 1
- fi
-
- if [ "$KVER" != "$(verfromdir "${RHEL4_KERNEL_BASE}/${DIR}")" ]
- then
- return 1
- fi
-
- return 0
-}
-
-# Takes a `uname -r` and returns "ver type", where ver
-# is 2.6.9-NN.EL and type is "smp" or the like.
-validate_version()
-{
- KVER="$1"
-
- dir=$(guess_rhel4_dir "$KVER")
- if validate_dir "$KVER" "$dir"
- then
- echo "${RHEL4_KERNEL_BASE}/${dir}"
- fi
-}
-
-find_version()
-{
- # Find the most recent valid kernel
- ls -1 -t "$RHEL4_KERNEL_BASE" | while read kdir
- do
- KVER="$(verfromdir "${RHEL4_KERNEL_BASE}/${kdir}")"
- if validate_dir "$KVER" "$kdir"
- then
- echo "${RHEL4_KERNEL_BASE}/${kdir}"
- break
- fi
- done
-}
-
-# For a given KVER, see if all the -devel packages exist
-validate_target()
-{
- KVER="$1"
- ARCH="$2"
- TYPELIST="$3"
-
- # Red Hat introduced the "largesmp" type in 34.EL. Anything older
- # can ignore it.
- LARGESMP="${KVER#2.6.9-}"
- LARGESMP="${LARGESMP%%.*}"
- if [ "$LARGESMP" -lt 34 ]
- then
- TYPELIST="${TYPELIST%,largesmp}"
- fi
-
- typelist="${TYPELIST#$ARCH:}"
- while :
- do
- type="${typelist%%,*}"
- VERDIR="$(validate_version ${KVER}${type})"
- if [ -z "$VERDIR" ]
- then
- return 1
- fi
-
- # This loop walks the list of types being careful of the empty
- # typename
- tmp="${typelist#*,}"
- if [ -z "$tmp" -o "$tmp" = "$typelist" ]
- then
- break
- fi
- typelist="$tmp"
- done
-
- return 0
-}
-
-find_targets()
-{
- # Pre-calculate ARCH and TYPELIST, at least
- ARCH="$(guess_rhel4_arch)"
- if [ -z "$ARCH" ]
- then
- return
- fi
-
- TYPELIST=
- for typelist in $RHEL4_KERNEL_TYPES
- do
- TARCH=$(echo "$typelist" | cut -f1 -d:)
- if [ "$TARCH" = "$ARCH" ]
- then
- TYPELIST="$typelist"
- break
- fi
- done
-
- if [ -z "$TYPELIST" ]
- then
- return
- fi
-
- ls -1 -t "$RHEL4_KERNEL_BASE" | while read kdir
- do
- case "$kdir" in
- 2.6.9-5.EL*)
- # Missing get_sb_pseudo()
- continue
- ;;
- *)
- ;;
- esac
-
- KVER="$(verfromdir "${RHEL4_KERNEL_BASE}/${kdir}")"
- if ! validate_dir "$KVER" "$kdir"
- then
- continue
- fi
- if validate_target "$KVER" "$ARCH" "$TYPELIST"
- then
- echo "rhel4_${KVER}_rpm"
- fi
- done
-}
-
-case "$1" in
-include|build)
- if [ -n "$2" ]
- then
- KPATH="$(validate_version "$2")"
- else
- KVER="$(uname -r)"
- KPATH="$(validate_version "$KVER")"
- if [ -z "$KPATH" ]
- then
- KPATH="$(find_version)"
- fi
- fi
- if [ -n "$KPATH" ]
- then
- if [ "$1" = "include" ]
- then
- KPATH="${KPATH}/include"
- fi
- echo "${KPATH}"
- fi
- ;;
-targets)
- find_targets
- ;;
-"")
- echo "Missing operation" >&2
- ;;
-*)
- echo "Invalid operation: $1" >&2
- exit 1
- ;;
-esac
Deleted: trunk/vendor/rhel4/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/rhel4/oracleasm.spec-generic.in 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/rhel4/oracleasm.spec-generic.in 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,299 +0,0 @@
-#
-# Spec file for oracleasm
-#
-
-# 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
-%define buildup 1
-%define buildsmp 0
-%define buildhugemem 0
-%define buildlargesmp 0
-
-%ifarch i686
-%define karch i686
-%define buildsmp 1
-%define buildhugemem 1
-%endif
-
-%ifarch x86_64
-%define karch x86_64
-%define buildsmp 1
-%define buildlargesmp @@LARGESMP@@
-%endif
-
-%ifarch ia32e
-%define karch ia32e
-%endif
-
-%ifarch ia64
-%define karch ia64
-%define buildlargesmp @@LARGESMP@@
-%endif
-
-%ifarch ppc64
-%define karch ppc64
-%define buildlargesmp @@LARGESMP@@
-%endif
-
-%ifarch s390x
-%define karch s390x
-%endif
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define kver @@KVER@@
-
-# 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@@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: oracleasm- at DIST_VERSION@.tar.gz
-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}
-BuildRequires: kernel-devel = %{kver}
-
-
-BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for the default kernel.
-
-%if %{buildsmp}
-%package -n oracleasm-%{kver}smp
-Summary: The Oracle Automatic Storage Management library driver for SMP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: oracleasm = %{version}
-Requires: kernel-smp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-smp-devel = %{kver}
-
-%description -n oracleasm-%{kver}smp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildhugemem}
-%package -n oracleasm-%{kver}hugemem
-Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-hugemem = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-hugemem-devel = %{kver}
-
-%description -n oracleasm-%{kver}hugemem
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for large memory SMP kernels.
-%endif
-
-
-%if %{buildlargesmp}
-%package -n oracleasm-%{kver}largesmp
-Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-largesmp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-largesmp-devel = %{kver}
-
-%description -n oracleasm-%{kver}largesmp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for large SMP kernels.
-%endif
-
-
-
-%prep
-%setup -n oracleasm-%{version}
-
-
-%build
-
-local_configure()
-{
- ./configure \
- --prefix=%{_prefix} \
- --exec-prefix=%{_exec_prefix} \
- --bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --with-vendor=rhel4 \
- --with-vendorkernel="$1"
-}
-
-%if %{buildup}
-local_configure "%{kver}"
-
-make QUIET=1
-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}/"
-
-make clean
-%endif
-
-%if %{buildsmp}
-local_configure "%{kver}smp"
-
-make QUIET=1
-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}smp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}smp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildhugemem}
-local_configure "%{kver}hugemem"
-
-make QUIET=1
-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}hugemem/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}hugemem/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildlargesmp}
-local_configure "%{kver}largesmp"
-
-make QUIET=1
-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}largesmp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}largesmp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-
-%install
-
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-
-%if %{buildup}
-%post -n oracleasm-%{kver}
-depmod -ae %{kver}
-
-%files -n oracleasm-%{kver}
-%defattr(-,root,root)
-/lib/modules/%{kver}/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildsmp}
-%post -n oracleasm-%{kver}smp
-depmod -ae %{kver}smp
-
-%files -n oracleasm-%{kver}smp
-%defattr(-,root,root)
-/lib/modules/%{kver}smp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildhugemem}
-%post -n oracleasm-%{kver}hugemem
-depmod -ae %{kver}hugemem
-
-%files -n oracleasm-%{kver}hugemem
-%defattr(-,root,root)
-/lib/modules/%{kver}hugemem/kernel/drivers/addon/oracleasm
-%endif
-
-%if %{buildlargesmp}
-%post -n oracleasm-%{kver}largesmp
-depmod -ae %{kver}largesmp
-
-%files -n oracleasm-%{kver}largesmp
-%defattr(-,root,root)
-/lib/modules/%{kver}largesmp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%changelog
-* 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
-
Modified: trunk/vendor/sles8/Vendor.make
===================================================================
--- trunk/vendor/sles8/Vendor.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/sles8/Vendor.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -4,7 +4,6 @@
TOOLSARCH = $(shell $(TOPDIR)/vendor/sles8/rpmarch.guess tools $(TOPDIR))
-
include $(TOPDIR)/vendor/common/Vendor.make
-packages: support_rpm
+packages: rpm
Modified: trunk/vendor/sles9/Makefile
===================================================================
--- trunk/vendor/sles9/Makefile 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/sles9/Makefile 2006-07-06 07:42:20 UTC (rev 349)
@@ -3,8 +3,6 @@
include $(TOPDIR)/Preamble.make
DIST_FILES = \
- oracleasm.spec-generic.in \
- kernel.guess \
rpmarch.guess \
Vendor.make \
vendor.guess
Modified: trunk/vendor/sles9/Vendor.make
===================================================================
--- trunk/vendor/sles9/Vendor.make 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/sles9/Vendor.make 2006-07-06 07:42:20 UTC (rev 349)
@@ -3,22 +3,7 @@
#
TOOLSARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess tools $(TOPDIR))
-MODULEARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess module $(TOPDIR))
-
-$(TOPDIR)/vendor/sles9/oracleasm-%.spec: $(TOPDIR)/vendor/sles9/oracleasm.spec-generic
- SPECVER="$@"; \
- SPECVER="$${SPECVER#*oracleasm-}"; \
- SPECVER="$${SPECVER%.spec}"; \
- sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
-
-sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/oracleasm-%.spec
- rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-$(patsubst sles9_%_srpm,%,$@).spec
-
-sles9_%_rpm: sles9_%_srpm
- rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
-
-
include $(TOPDIR)/vendor/common/Vendor.make
-packages: $(shell $(TOPDIR)/vendor/sles9/kernel.guess targets) support_rpm
+packages: rpm
Deleted: trunk/vendor/sles9/kernel.guess
===================================================================
--- trunk/vendor/sles9/kernel.guess 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/sles9/kernel.guess 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,286 +0,0 @@
-#!/bin/sh
-
-SLES9_KERNEL_BASE="/usr/src"
-
-#
-# SLES9 has wacky names for its kernel flavors. So we'll just create
-# a list here of the mappings. It's pretty simple. One entry per
-# architecture, <arch>:<flavor1>[,<flavor> ...]
-#
-# Anyway, we can even reuse this when detecting kernels to build
-# packages for. A kernel is only built if build trees for all flavors
-# are installed.
-#
-SLES9_KERNEL_TYPES="
- x86_64:default,smp
- ppc64:pseries64,iseries64,pmac64
- ia64:default,64k-pagesize,sn2
- i386:default,smp,bigsmp
- s390:s390x
-"
-
-
-
-guess_sles9_arch()
-{
- ARCH=$(uname -m)
- case "$ARCH" in
- i386|i586|i686)
- echo "i386"
- ;;
- s390x)
- echo "s390"
- ;;
- *)
- # This appears to be correct on ppc64
- echo "$ARCH"
- ;;
- esac
-}
-
-guess_sles9_type()
-{
- KVER="$1"
-
- ARCH="$(guess_sles9_arch)"
- if [ -z "$ARCH" ]
- then
- return
- fi
-
- for typelist in $SLES9_KERNEL_TYPES
- do
- TARCH=$(echo $typelist | cut -f1 -d:)
- if [ "$TARCH" = "$ARCH" ]
- then
- for type in $(echo $typelist | cut -f2 -d: | sed -e 's/,/ /g')
- do
- case "$KVER" in
- *-${type})
- echo "$type"
- break
- ;;
- *)
- ;;
- esac
- done
- break
- fi
- done
-}
-
-guess_sles9_dir()
-{
- KVER="$1"
-
- DIRTYPE=$(guess_sles9_type "$KVER")
- ARCH=$(guess_sles9_arch)
-
- if [ -n "$DIRTYPE" ]
- then
- echo "linux-${1%-${DIRTYPE}}-obj/${ARCH}/${DIRTYPE}"
- fi
-}
-
-verfromdir()
-{
- TESTDIR="$1"
- if [ -r "${TESTDIR}/include/linux/version.h" ]
- then
- awk '/UTS_RELEASE/{gsub(/"/,"",$3); print $3}' "${TESTDIR}/include/linux/version.h"
- fi
-}
-
-validate_dir()
-{
- KVER="$1"
- DIR="$2"
-
- if [ ! -d "${SLES9_KERNEL_BASE}/${DIR}" ]
- then
- return 1
- elif [ ! -f "${SLES9_KERNEL_BASE}/${DIR}/include/linux/autoconf.h" ]
- then
- return 1
- elif [ ! -f "${SLES9_KERNEL_BASE}/${DIR}/include/linux/version.h" ]
- then
- return 1
- fi
-
- if [ "$KVER" != "`verfromdir "${SLES9_KERNEL_BASE}/${DIR}"`" ]
- then
- return 1
- fi
-
- return 0
-}
-
-# Takes a `uname -r` and returns "ver type", where ver
-# is 2.6.9-NN.EL and type is "smp" or the like.
-validate_version()
-{
- KVER="$1"
-
- dir=`guess_sles9_dir "$KVER"`
- if validate_dir "$KVER" "$dir"
- then
- echo "${SLES9_KERNEL_BASE}/${dir}"
- fi
-}
-
-find_version()
-{
- ARCH="$(guess_sles9_arch)"
- if [ -z "$ARCH" ]
- then
- return
- fi
-
- types=
- for typelist in $SLES9_KERNEL_TYPES
- do
- TARCH=$(echo $typelist | cut -f1 -d:)
- if [ "$TARCH" = "$ARCH" ]
- then
- types=$(echo $typelist | cut -f2 -d: | sed -e 's/,/ /g')
- break
- fi
- done
-
- if [ -z "$types" ]
- then
- return
- fi
-
- # Find the most recent valid kernel
- ls -1 -t "$SLES9_KERNEL_BASE" | while read kdir
- do
- if [ -L "${SLES9_KERNEL_BASE}/${kdir}" -o ! -d "${SLES9_KERNEL_BASE}/${kdir}" ]
- then
- continue
- fi
-
- case "$kdir" in
- *-obj)
- ;;
- *)
- continue
- ;;
- esac
- KERNELDIR=
- for type in $types
- do
- KVER="`verfromdir "${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
- if validate_dir "$KVER" "$kdir/${ARCH}/${type}"
- then
- KERNELDIR="${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"
- break
- fi
- done
- if [ -n "$KERNELDIR" ]
- then
- echo "$KERNELDIR"
- break
- fi
- done
-}
-
-validate_target()
-{
- DIR="$1"
- ARCH="$2"
- types="$3"
- for type in $types
- do
- KVER="`verfromdir "${SLES9_KERNEL_BASE}/${kdir}/${ARCH}/${type}"`"
- if ! validate_dir "$KVER" "$kdir/${ARCH}/${type}"
- then
- return 1
- fi
- done
-
- return 0
-}
-
-find_targets()
-{
- ARCH="$(guess_sles9_arch)"
- if [ -z "$ARCH" ]
- then
- return
- fi
-
- types=
- for typelist in $SLES9_KERNEL_TYPES
- do
- TARCH=$(echo $typelist | cut -f1 -d:)
- if [ "$TARCH" = "$ARCH" ]
- then
- types=$(echo $typelist | cut -f2 -d: | sed -e 's/,/ /g')
- break
- fi
- done
-
- if [ -z "$types" ]
- then
- return
- fi
-
- ls -1 -t "$SLES9_KERNEL_BASE" | while read kdir
- do
- # Avoid the symlinks
- if [ -L "${SLES9_KERNEL_BASE}/${kdir}" -o ! -d "${SLES9_KERNEL_BASE}/${kdir}" ]
- then
- continue
- fi
- case "$kdir" in
- linux-*-obj)
- if validate_target "$kdir" "$ARCH" "$types"
- then
- KVER="${kdir#linux-}"
- KVER="${KVER%-obj}"
- if rpm -q "kernel-syms-${KVER}" 1>/dev/null 2>&1
- then
- echo "sles9_${KVER}_rpm"
- fi
- fi
- ;;
- *)
- ;;
- esac
- done
-}
-
-case "$1" in
-include|build)
- if [ -n "$2" ]
- then
- KPATH="`validate_version "$2"`"
- else
- KVER="`uname -r`"
- KPATH="`validate_version "$KVER"`"
- if [ -z "$KPATH" ]
- then
- KPATH="`find_version`"
- fi
- fi
- if [ -n "$KPATH" ]
- then
- if [ "$1" = "include" ]
- then
- KPATH="${KPATH}/include"
- fi
- echo "${KPATH}"
- fi
- ;;
-targets)
- find_targets
- ;;
-"")
- echo "Missing operation" >&2
- ;;
-*)
- echo "Invalid operation: $1" >&2
- exit 1
- ;;
-esac
Deleted: trunk/vendor/sles9/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/sles9/oracleasm.spec-generic.in 2006-06-30 22:47:32 UTC (rev 348)
+++ trunk/vendor/sles9/oracleasm.spec-generic.in 2006-07-06 07:42:20 UTC (rev 349)
@@ -1,578 +0,0 @@
-#
-# Spec file for oracleasm
-#
-
-# 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
-%define builddefault 1
-%define buildsmp 1
-%define buildbigsmp 1
-%define build64kpagesize 0
-%define buildsn2 0
-%define buildiseries64 0
-%define buildpmac64 0
-%define buildpseries64 0
-%define builds390 0
-%define builds390x 0
-
-%ifarch %{ix86}
-%define karch i386
-%endif
-
-%ifarch x86_64 ia32e
-%define karch x86_64
-
-%define buildbigsmp 0
-%endif
-
-%ifarch ia64
-%define karch ia64
-
-%define buildsmp 0
-%define buildbigsmp 0
-%define build64kpagesize 1
-%define buildsn2 1
-%endif
-
-%ifarch ppc64
-%define karch ppc64
-
-%define builddefault 0
-%define buildsmp 0
-%define buildbigsmp 0
-%define buildiseries64 1
-%define buildpmac64 1
-%define buildpseries64 1
-%endif
-
-%ifarch s390
-%define karch s390
-
-%define builddefault 0
-%define buildsmp 0
-%define buildbigsmp 0
-%define builds390 1
-%endif
-
-%ifarch s390x
-%define karch s390
-
-%define builddefault 0
-%define buildsmp 0
-%define buildbigsmp 0
-%define builds390x 1
-%endif
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define kver @@KVER@@
-
-# 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@@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: oracleasm- at DIST_VERSION@.tar.gz
-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-default = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-
-BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for the default kernel.
-
-%if %{builddefault}
-%package default
-Summary: The Oracle Automatic Storage Management library driver for UP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: oracleasm = %{version}
-Requires: kernel-default = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description default
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for the default kernel.
-%endif
-
-
-%if %{buildsmp}
-%package smp
-Summary: The Oracle Automatic Storage Management library driver for SMP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: oracleasm = %{version}
-Requires: kernel-smp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description smp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildbigsmp}
-%package bigsmp
-Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-bigsmp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description bigsmp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for large memory SMP kernels.
-%endif
-
-
-%if %{build64kpagesize}
-%package 64k-pagesize
-Summary: The Oracle Automatic Storage Management library driver for Itanium kernels with a 64KB pagesize.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-64k-pagesize = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description 64k-pagesize
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for Itanium kernels with a 64KB pagesize.
-%endif
-
-
-%if %{buildsn2}
-%package sn2
-Summary: The Oracle Automatic Storage Management library driver for Altix systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-sn2 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description sn2
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for UP Itanium2 kernels.
-%endif
-
-
-%if %{buildiseries64}
-%package iseries64
-Summary: The Oracle Automatic Storage Management library driver for IBM iSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-iseries64 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description iseries64
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM iSeries systems.
-%endif
-
-
-%if %{buildpmac64}
-%package pmac64
-Summary: The Oracle Automatic Storage Management library driver for 64-bit Power Macintosh kernels.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-pmac64 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description pmac64
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for 64-bit Power Macintosh kernels.
-%endif
-
-
-%if %{buildpseries64}
-%package pseries64
-Summary: The Oracle Automatic Storage Management library driver for IBM pSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-pseries64 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description pseries64
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM pSeries systems.
-%endif
-
-
-%if %{builds390}
-%package s390
-Summary: The Oracle Automatic Storage Management library driver for IBM S/390 31-bit systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-s390 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description s390
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM S/390 31-bit systems.
-%endif
-
-
-%if %{builds390x}
-%package s390x
-Summary: The Oracle Automatic Storage Management library driver for IBM zSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-s390x = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description s390x
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM zSeries systems.
-%endif
-
-
-
-%prep
-%setup -n oracleasm-%{version}
-
-
-%build
-
-local_configure()
-{
- ./configure \
- --prefix=%{_prefix} \
- --exec-prefix=%{_exec_prefix} \
- --bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} \
- --with-vendor=sles9 \
- --with-vendorkernel="$1"
-}
-
-%if %{builddefault}
-local_configure "%{kver}-default"
-make QUIET=1
-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}-default/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildsmp}
-local_configure "%{kver}-smp"
-make QUIET=1
-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}-smp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildbigsmp}
-local_configure "%{kver}-bigsmp"
-make QUIET=1
-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}-bigsmp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{build64kpagesize}
-local_configure "%{kver}-64k-pagesize"
-make QUIET=1
-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}-64k-pagesize/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildsn2}
-local_configure "%{kver}-sn2"
-make QUIET=1
-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}-sn2/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildiseries64}
-local_configure "%{kver}-iseries64"
-make QUIET=1
-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}-iseries64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildpmac64}
-local_configure "%{kver}-pmac64"
-make QUIET=1
-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}-pmac64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildpseries64}
-local_configure "%{kver}-pseries64"
-make QUIET=1
-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}-pseries64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{builds390}
-local_configure "%{kver}-s390"
-make QUIET=1
-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}-s390/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{builds390x}
-local_configure "%{kver}-s390x"
-make QUIET=1
-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}-s390x/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-
-
-%install
-
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-
-%if %{builddefault}
-%post default
-depmod -ae %{kver}-default
-
-%files default
-%defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildsmp}
-%post smp
-depmod -ae %{kver}-smp
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildbigsmp}
-%post bigsmp
-depmod -ae %{kver}-bigsmp
-
-%files bigsmp
-%defattr(-,root,root)
-/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{build64kpagesize}
-%post 64k-pagesize
-depmod -ae %{kver}-64k-pagesize
-
-%files 64k-pagesize
-%defattr(-,root,root)
-/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildsn2}
-%post sn2
-depmod -ae %{kver}-sn2/
-
-%files sn2
-%defattr(-,root,root)
-/lib/modules/%{kver}-sn2/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildiseries64}
-%post iseries64
-depmod -ae %{kver}-iseries64
-
-%files iseries64
-%defattr(-,root,root)
-/lib/modules/%{kver}-iseries64/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildpmac64}
-%post pmac64
-depmod -ae %{kver}-pmac64
-
-%files pmac64
-%defattr(-,root,root)
-/lib/modules/%{kver}-pmac64/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildpseries64}
-%post pseries64
-depmod -ae %{kver}-pseries64
-
-%files pseries64
-%defattr(-,root,root)
-/lib/modules/%{kver}-pseries64/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{builds390}
-%post s390
-depmod -ae %{kver}-s390
-
-%files s390
-%defattr(-,root,root)
-/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{builds390x}
-%post s390x
-depmod -ae %{kver}-s390x
-
-%files s390x
-%defattr(-,root,root)
-/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm
-%endif
-
-
-
-%changelog
-* 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