[Ocfs2-commits] jlbec commits r2773 - in branches/ocfs2-1.2: . vendor/ax2

svn-commits@oss.oracle.com svn-commits at oss.oracle.com
Wed Feb 22 17:08:55 CST 2006


Author: jlbec
Signed-off-by: mfasheh
Date: 2006-02-22 17:08:53 -0600 (Wed, 22 Feb 2006)
New Revision: 2773

Added:
   branches/ocfs2-1.2/vendor/ax2/Vendor.make
   branches/ocfs2-1.2/vendor/ax2/kernel.guess
   branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in
   branches/ocfs2-1.2/vendor/ax2/rpmarch.guess
   branches/ocfs2-1.2/vendor/ax2/vendor.guess
Removed:
   branches/ocfs2-1.2/vendor/ax2/ocfs2-2.6.9-AX.spec-generic.in
Modified:
   branches/ocfs2-1.2/Makefile
   branches/ocfs2-1.2/configure.in
   branches/ocfs2-1.2/vendor/ax2/Makefile
Log:

o Add Asianux support for the vendor code.  Someone plase verify

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/Makefile
===================================================================
--- branches/ocfs2-1.2/Makefile	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/Makefile	2006-02-22 23:08:53 UTC (rev 2773)
@@ -50,22 +50,7 @@
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/kapi-compat/include
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/patches
 
-#
-# AX2
-#
-$(TOPDIR)/vendor/ax2/ocfs2-2.6.9-%AX.spec: $(TOPDIR)/vendor/ax2/ocfs2-2.6.9-AX.spec-generic
-	SPECVER="$@"; \
-		SPECVER="$${SPECVER#*ocfs2-2.6.9-}"; \
-		SPECVER="$${SPECVER%AX.spec}"; \
-		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
 
-ax2_%_srpm: dist $(TOPDIR)/vendor/ax2/ocfs2-2.6.9-%AX.spec
-	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/ax2/ocfs2-2.6.9-$(patsubst ax2_%_srpm,%,$@)AX.spec
-
-ax2_%_rpm: ax2_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) ocfs2-2.6.9-$(patsubst ax2_%_rpm,%,$@)AX-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
-
-
 include Vendor.make
 
 include $(TOPDIR)/Postamble.make

Modified: branches/ocfs2-1.2/configure.in
===================================================================
--- branches/ocfs2-1.2/configure.in	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/configure.in	2006-02-22 23:08:53 UTC (rev 2773)
@@ -247,7 +247,7 @@
 AC_SUBST(KAPI_COMPAT_CFLAGS)
 
 AC_OUTPUT([Config.make
-vendor/ax2/ocfs2-2.6.9-AX.spec-generic
+vendor/ax2/ocfs2.spec-generic
 vendor/rhel4/ocfs2.spec-generic
 vendor/sles9/ocfs2.spec-generic
 ])

Modified: branches/ocfs2-1.2/vendor/ax2/Makefile
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/Makefile	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/vendor/ax2/Makefile	2006-02-22 23:08:53 UTC (rev 2773)
@@ -2,7 +2,11 @@
 
 include $(TOPDIR)/Preamble.make
 
-DIST_FILES = \
-	ocfs2-2.6.9-AX.spec-generic.in
+DIST_FILES = 				\
+	ocfs2.spec-generic.in		\
+	kernel.guess			\
+	rpmarch.guess			\
+	Vendor.make			\
+	vendor.guess
 
 include $(TOPDIR)/Postamble.make

Added: branches/ocfs2-1.2/vendor/ax2/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/Vendor.make	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/vendor/ax2/Vendor.make	2006-02-22 23:08:53 UTC (rev 2773)
@@ -0,0 +1,21 @@
+#
+# Asianux 2
+#
+
+TOOLSARCH = $(shell $(TOPDIR)/vendor/ax2/rpmarch.guess tools $(TOPDIR))
+MODULEARCH = $(shell $(TOPDIR)/vendor/ax2/rpmarch.guess module $(TOPDIR))
+
+$(TOPDIR)/vendor/ax2/ocfs2-%.spec: $(TOPDIR)/vendor/ax2/ocfs2.spec-generic
+	SPECVER="$@"; \
+		SPECVER="$${SPECVER#*ocfs2-}"; \
+		SPECVER="$${SPECVER%.spec}"; \
+		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
+
+ax2_%_srpm: dist $(TOPDIR)/vendor/ax2/ocfs2-%.spec
+	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/ax2/ocfs2-$(patsubst ax2_%_srpm,%,$@).spec
+
+ax2_%_rpm: ax2_%_srpm
+	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst ax2_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+
+
+packages: $(shell $(TOPDIR)/vendor/ax2/kernel.guess targets)

Added: branches/ocfs2-1.2/vendor/ax2/kernel.guess
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/kernel.guess	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/vendor/ax2/kernel.guess	2006-02-22 23:08:53 UTC (rev 2773)
@@ -0,0 +1,229 @@
+#!/bin/sh
+
+
+AX2_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!
+#
+AX2_KERNEL_TYPES="
+    i686:,smp,hugemem
+    x86_64:,smp
+    ia64:
+    ppc64:
+"
+
+
+guess_ax2_arch()
+{
+    # This appears to DTRT (i686 on x86, ppc64 on pSeries).
+    uname -m
+}
+
+guess_ax2_type()
+{
+    case "$1" in
+    *smp)
+        echo "smp"
+        ;;
+    *hugemem)
+        echo "hugemem"
+        ;;
+    *hugeproc)
+        echo "hugeproc"
+        ;;
+    *)
+        echo ""
+        ;;
+    esac
+}
+
+guess_ax2_dir()
+{
+    KVER="$1"
+
+    DIRTYPE=$(guess_ax2_type "$KVER")
+    ARCH=$(guess_ax2_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 "${AX2_KERNEL_BASE}/${DIR}" ]
+    then
+        return 1
+    elif [ ! -f "${AX2_KERNEL_BASE}/${DIR}/include/linux/autoconf.h" ]
+    then
+        return 1
+    elif [ ! -f "${AX2_KERNEL_BASE}/${DIR}/include/linux/version.h" ]
+    then
+        return 1
+    fi
+
+    if [ "$KVER" != "$(verfromdir "${AX2_KERNEL_BASE}/${DIR}")" ]
+    then
+        return 1
+    fi
+
+    return 0
+}
+
+# Takes a `uname -r` and returns "ver type", where ver
+# is 2.6.9-NN.AX and type is "smp" or the like.
+validate_version()
+{
+    KVER="$1"
+
+    dir=$(guess_ax2_dir "$KVER")
+    if validate_dir "$KVER" "$dir"
+    then
+        echo "${AX2_KERNEL_BASE}/${dir}"
+    fi
+}
+
+find_version()
+{
+    # Find the most recent valid kernel
+    ls -1 -t "$AX2_KERNEL_BASE" | while read kdir
+    do
+        KVER="$(verfromdir "${AX2_KERNEL_BASE}/${kdir}")"
+        if validate_dir "$KVER" "$kdir"
+        then
+            echo "${AX2_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"
+
+    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_ax2_arch)"
+    if [ -z "$ARCH" ]
+    then
+        return
+    fi
+
+    TYPELIST=
+    for typelist in $AX2_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 "$AX2_KERNEL_BASE" | while read kdir
+    do
+        case "$kdir" in
+        *)
+            ;;
+        esac
+
+        KVER="$(verfromdir "${AX2_KERNEL_BASE}/${kdir}")"
+        if ! validate_dir "$KVER" "$kdir"
+        then
+            continue
+        fi
+        if validate_target "$KVER" "$ARCH" "$TYPELIST"
+        then
+            echo "ax2_${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: branches/ocfs2-1.2/vendor/ax2/ocfs2-2.6.9-AX.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/ocfs2-2.6.9-AX.spec-generic.in	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/vendor/ax2/ocfs2-2.6.9-AX.spec-generic.in	2006-02-22 23:08:53 UTC (rev 2773)
@@ -1,196 +0,0 @@
-#
-# Spec file for OCFS2 on AX2
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-# Because RPM is dumb
-%define _unpackaged_files_terminate_build 0
-
-# Turn ons and offs
-%define buildup		1
-%define buildsmp	1
-%define buildhugemem	1
-
-%ifarch i386 i686
-%define karch i686
-%endif
-
-%ifarch x86_64
-%define karch x86_64
-%define buildhugemem	0
-%endif
-
-%ifarch ia64
-%define karch ia64
-%define buildsmp	0
-%define buildhugemem	0
-%endif
-
-%define base		2.6.9
-%define sver		%{generic}
-%define kver		%{base}-%{sver}AX
-
-# The minimum tools package required for the kernel bits.
-%define tools_ver     @TOOLS_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem 2.
-Name: ocfs2-%{kver}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle
-Packager: Joel Becker <joel.becker at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: kernel = %{kver}
-Requires: ocfs2-tools >= %{tools_ver}
-BuildRequires: kernel-devel = %{kver}
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
-uniprocessor kernels.
-
-%if %{buildsmp}
-%package -n ocfs2-%{kver}smp
-Summary: The Oracle Cluster File System 2 for SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-smp = %{kver}
-Requires: ocfs2-tools >= %{tools_ver}
-BuildRequires: kernel-smp-devel = %{kver}
-AutoReqProv: no
-
-%description -n ocfs2-%{kver}smp
-OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
-symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildhugemem}
-%package -n ocfs2-%{kver}hugemem
-Summary: The Oracle Cluster File System 2 for huge memory systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-hugemem = %{kver}
-Requires: ocfs2-tools >= %{tools_ver}
-BuildRequires: kernel-hugemem-devel = %{kver}
-AutoReqProv: no
-
-%description -n ocfs2-%{kver}hugemem
-OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
-symmetric multiprocessor kernels.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-%if %{buildup}
-KPATH="/usr/src/kernels/%{kver}-%{karch}"
-%configure --with-kernel="${KPATH}"
-
-make
-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"
-mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
-
-make clean
-%endif
-
-%if %{buildsmp}
-KPATH="/usr/src/kernels/%{kver}-smp-%{karch}"
-%configure --with-kernel="${KPATH}"
-
-make
-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"
-mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
-
-make clean
-%endif
-
-%if %{buildhugemem}
-KPATH="/usr/src/kernels/%{kver}-hugemem-%{karch}"
-%configure --with-kernel="${KPATH}"
-
-make
-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"
-mkdir -p "${INST_MODLIB}/fs/ocfs2"
-mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
-mkdir -p "${INST_MODLIB}/fs/configfs"
-mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
-rm "${EXTRA_MODLIB}"/*.ko
-
-make clean
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{buildup}
-%post
-depmod -a
-
-%files
-%defattr(-,root,root)
-/lib/modules/%{kver}/kernel/fs
-%endif
-
-%if %{buildsmp}
-%post -n ocfs2-%{kver}smp
-depmod -a
-
-%files -n ocfs2-%{kver}smp
-%defattr(-,root,root)
-/lib/modules/%{kver}smp/kernel/fs
-%endif
-
-
-%if %{buildhugemem}
-%post -n ocfs2-%{kver}hugemem
-depmod -a
-
-%files -n ocfs2-%{kver}hugemem
-%defattr(-,root,root)
-/lib/modules/%{kver}hugemem/kernel/fs
-%endif
-
-
-%changelog
-* Fri Aug 12 2005 Dean Tan <dean.tan at oracle.com>
-- Modified for Asianux
-
-* Mon Jan 24 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Copied: branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in (from rev 2770, branches/ocfs2-1.2/vendor/ax2/ocfs2-2.6.9-AX.spec-generic.in)
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/ocfs2-2.6.9-AX.spec-generic.in	2006-02-22 22:57:53 UTC (rev 2770)
+++ branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in	2006-02-22 23:08:53 UTC (rev 2773)
@@ -0,0 +1,220 @@
+#
+# Spec file for OCFS2 on AX2
+#
+
+# Macros
+# This one is hardcoded because, well, it belongs there
+%define _prefix /usr
+# Because RPM is dumb
+%define _unpackaged_files_terminate_build 0
+
+# Turn ons and offs
+%define buildup		1
+%define buildsmp	0
+%define buildhugemem	0
+
+%ifarch i386 i686
+%define karch		i686
+%define buildsmp	1
+%define buildhugemem	1
+%endif
+
+%ifarch x86_64
+%define karch		x86_64
+%define buildsmp	1
+%endif
+
+%ifarch ia64
+%define karch		ia64
+%endif
+
+%ifarch ppc64
+%define karch		ppc64
+%endif
+
+%ifarch s390x
+%define karch		s390x
+%endif
+
+%define kver		@@KVER@@
+
+# The minimum tools package required for the kernel bits.
+%define tools_ver     @TOOLS_REQUIRED_VERSION@
+
+Summary: The Oracle Cluster Filesystem 2.
+Name: ocfs2-%{kver}
+Version: @DIST_VERSION@
+Release: @@PKG_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
+Packager: Joel Becker <joel.becker at oracle.com>
+Provides: ocfs2 = %{version}
+AutoReqProv: no
+Requires: kernel = %{kver}
+Requires: ocfs2-tools >= %{tools_ver}
+BuildRequires: kernel-devel = %{kver}
+
+
+BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+
+
+%description
+OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
+uniprocessor kernels.
+
+%if %{buildsmp}
+%package -n ocfs2-%{kver}smp
+Summary: The Oracle Cluster File System 2 for SMP systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-smp = %{kver}
+Requires: ocfs2-tools >= %{tools_ver}
+BuildRequires: kernel-smp-devel = %{kver}
+AutoReqProv: no
+
+%description -n ocfs2-%{kver}smp
+OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
+symmetric multiprocessor kernels.
+%endif
+
+
+%if %{buildhugemem}
+%package -n ocfs2-%{kver}hugemem
+Summary: The Oracle Cluster File System 2 for huge memory systems.
+Group: System Environment/Kernel
+Provides: ocfs2 = %{version}
+Requires: kernel-hugemem = %{kver}
+Requires: ocfs2-tools >= %{tools_ver}
+BuildRequires: kernel-hugemem-devel = %{kver}
+AutoReqProv: no
+
+%description -n ocfs2-%{kver}hugemem
+OCFS2 is the Oracle Cluster Filesystem 2.  This package is compiled for
+symmetric multiprocessor kernels.
+%endif
+
+
+%prep
+%setup -n ocfs2-%{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=ax2			\
+		--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"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/configfs"
+mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+rm "${EXTRA_MODLIB}"/*.ko
+
+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"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/configfs"
+mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+rm "${EXTRA_MODLIB}"/*.ko
+
+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"
+mkdir -p "${INST_MODLIB}/fs/ocfs2"
+mv "${EXTRA_MODLIB}"/ocfs2*.ko "${INST_MODLIB}/fs/ocfs2/"
+mkdir -p "${INST_MODLIB}/fs/configfs"
+mv "${EXTRA_MODLIB}"/configfs.ko "${INST_MODLIB}/fs/configfs/"
+rm "${EXTRA_MODLIB}"/*.ko
+
+make clean
+%endif
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+%if %{buildup}
+%post
+depmod -a
+
+%files
+%defattr(-,root,root)
+/lib/modules/%{kver}/kernel/fs
+%endif
+
+%if %{buildsmp}
+%post -n ocfs2-%{kver}smp
+depmod -a
+
+%files -n ocfs2-%{kver}smp
+%defattr(-,root,root)
+/lib/modules/%{kver}smp/kernel/fs
+%endif
+
+
+%if %{buildhugemem}
+%post -n ocfs2-%{kver}hugemem
+depmod -a
+
+%files -n ocfs2-%{kver}hugemem
+%defattr(-,root,root)
+/lib/modules/%{kver}hugemem/kernel/fs
+%endif
+
+
+%changelog
+* Fri Aug 12 2005 Dean Tan <dean.tan at oracle.com>
+- Modified for Asianux
+
+* Mon Jan 24 2004 Manish Singh <manish.singh at oracle.com>
+- Initial rpm spec file

Added: branches/ocfs2-1.2/vendor/ax2/rpmarch.guess
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/rpmarch.guess	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/vendor/ax2/rpmarch.guess	2006-02-22 23:08:53 UTC (rev 2773)
@@ -0,0 +1,68 @@
+#! /bin/sh
+
+mode="$1"
+srcdir="$2"
+
+host_cpu=
+
+
+QUERYFILE=/etc/asianux-release
+
+if test -n "$QUERYFILE"; then
+  host_cpu="`rpm -qf $QUERYFILE --queryformat \"%{ARCH}\"`"
+fi
+
+if test -z "$host_cpu" -o "$host_cpu" = "noarch" ; then
+  host_alias=`$srcdir/config.guess`
+  host=`$srcdir/config.sub $host_alias`
+  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+fi
+
+case "$host_cpu" in
+  x86_64|ia64|s390x)
+    TOOLSARCH="$host_cpu"
+    ;;
+  i386|i486|i586|i686|i786|k6|k7)
+    TOOLSARCH="i386"
+    ;;
+  ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+    TOOLSARCH="ppc64"
+    ;;
+  *)
+    echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
+    TOOLSARCH=""
+    ;;
+esac
+
+# Only a few of these need to be overwritten from RPM's default
+case "$host_cpu" in
+  i386|i586)
+    MODULEARCH="i686"
+    ;;
+  ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+    MODULEARCH="ppc64"
+    ;;
+  *)
+    MODULEARCH=""
+    ;;
+esac
+
+case "$mode" in
+  module)
+    if [ -n "$MODULEARCH" ] ; then
+      echo "--target $MODULEARCH"
+    fi
+    ;;
+  tools)
+    if [ -n "$TOOLSARCH" ] ; then
+      echo "--target $TOOLSARCH"
+    fi
+    ;;
+  *)
+    echo "rpmarch.guess: Invalid mode: $mode" >&2
+    echo "error"
+    exit 1
+    ;;
+esac
+
+exit 0

Added: branches/ocfs2-1.2/vendor/ax2/vendor.guess
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/vendor.guess	2006-02-22 23:05:43 UTC (rev 2772)
+++ branches/ocfs2-1.2/vendor/ax2/vendor.guess	2006-02-22 23:08:53 UTC (rev 2773)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -f /etc/asianux-release ]
+then
+    exit 1
+fi
+
+if [ "`rpm -qf /etc/asianux-release --qf '%{VERSION}' 2>/dev/null`" != "8AX" ]
+then
+    exit 1
+fi
+
+exit 0




More information about the Ocfs2-commits mailing list