[Ocfs2-commits] jlbec commits r2512 - in branches/ocfs2-1.0: . vendor vendor/asianux vendor/redhat

Fri Aug 12 11:53:57 CDT 2005

Author: jlbec
Signed-off-by: manish
Date: 2005-08-12 11:53:55 -0500 (Fri, 12 Aug 2005)
New Revision: 2512

Added:
   branches/ocfs2-1.0/vendor/asianux/
   branches/ocfs2-1.0/vendor/asianux/Makefile
   branches/ocfs2-1.0/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in
Removed:
   branches/ocfs2-1.0/vendor/asianux/Makefile
   branches/ocfs2-1.0/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in
Modified:
   branches/ocfs2-1.0/Makefile
   branches/ocfs2-1.0/configure.in
   branches/ocfs2-1.0/vendor/Makefile
   branches/ocfs2-1.0/vendor/redhat/
Log:

o Merge of [2510:2511] from trunk:
	[2511] - Add spec-generic and assocated Makefile targets for
	         Asianux.

Signed-off-by: manish



Modified: branches/ocfs2-1.0/Makefile
===================================================================

--- branches/ocfs2-1.0/Makefile	2005-08-12 16:43:11 UTC (rev 2511)
+++ branches/ocfs2-1.0/Makefile	2005-08-12 16:53:55 UTC (rev 2512)
@@ -46,6 +46,22 @@
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/patches
 
 #
+# AX2
+#
+$(TOPDIR)/vendor/asianux/ocfs2-2.6.9-%AX.spec: $(TOPDIR)/vendor/asianux/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/asianux/ocfs2-2.6.9-%AX.spec
+	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/asianux/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
+
+
+#
 # RHEL4
 #
 $(TOPDIR)/vendor/redhat/ocfs2-2.6.9-%.EL.spec: $(TOPDIR)/vendor/redhat/ocfs2-2.6.9-EL.spec-generic

Modified: branches/ocfs2-1.0/configure.in
===================================================================
--- branches/ocfs2-1.0/configure.in	2005-08-12 16:43:11 UTC (rev 2511)
+++ branches/ocfs2-1.0/configure.in	2005-08-12 16:53:55 UTC (rev 2512)
@@ -260,6 +260,7 @@
 AC_SUBST(KAPI_COMPAT_CFLAGS)
 
 AC_OUTPUT([Config.make
+vendor/asianux/ocfs2-2.6.9-AX.spec-generic
 vendor/redhat/ocfs2-2.6.9-EL.spec-generic
 vendor/suse/ocfs2-2.6.5.spec-generic
 ])

Modified: branches/ocfs2-1.0/vendor/Makefile
===================================================================
--- branches/ocfs2-1.0/vendor/Makefile	2005-08-12 16:43:11 UTC (rev 2511)
+++ branches/ocfs2-1.0/vendor/Makefile	2005-08-12 16:53:55 UTC (rev 2512)
@@ -2,6 +2,6 @@
 
 include $(TOPDIR)/Preamble.make
 
-SUBDIRS = redhat suse
+SUBDIRS = asianux redhat suse
 
 include $(TOPDIR)/Postamble.make

Copied: branches/ocfs2-1.0/vendor/asianux (from rev 2511, trunk/vendor/asianux)


Property changes on: branches/ocfs2-1.0/vendor/asianux
___________________________________________________________________
Name: svn:ignore
   + .*.sw?
ocfs2-*.spec-generic


Deleted: branches/ocfs2-1.0/vendor/asianux/Makefile
===================================================================
--- trunk/vendor/asianux/Makefile	2005-08-12 16:43:11 UTC (rev 2511)
+++ branches/ocfs2-1.0/vendor/asianux/Makefile	2005-08-12 16:53:55 UTC (rev 2512)
@@ -1,8 +0,0 @@
-TOPDIR = ../..
-
-include $(TOPDIR)/Preamble.make
-
-DIST_FILES = \
-	ocfs2-2.6.9-AX.spec-generic.in
-
-include $(TOPDIR)/Postamble.make

Copied: branches/ocfs2-1.0/vendor/asianux/Makefile (from rev 2511, trunk/vendor/asianux/Makefile)

Deleted: branches/ocfs2-1.0/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in
===================================================================
--- trunk/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in	2005-08-12 16:43:11 UTC (rev 2511)
+++ branches/ocfs2-1.0/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in	2005-08-12 16:53:55 UTC (rev 2512)
@@ -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.0/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in (from rev 2511, trunk/vendor/asianux/ocfs2-2.6.9-AX.spec-generic.in)


Property changes on: branches/ocfs2-1.0/vendor/redhat
___________________________________________________________________
Name: svn:ignore
   - ocfs2-*.spec-generic

   + ocfs2-*.spec-generic
.*.sw?


