[Ocfs2-commits] jlbec commits r1849 - in trunk: . vendor/redhat

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-01-25 01:56:49 -0600 (Tue, 25 Jan 2005)
New Revision: 1849

Modified:
   trunk/Makefile
   trunk/vendor/redhat/ocfs2-2.6.9-EL.spec-generic.in
Log:

o Commit some updates to the rhel4 spec to handle MODULEARCH rebuild.



Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2005-01-25 01:13:34 UTC (rev 1848)
+++ trunk/Makefile	2005-01-25 07:56:49 UTC (rev 1849)
@@ -50,7 +50,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/redhat/ocfs2-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
 
 rhel4_%_rpm: rhel4_%_srpm
-	rpmbuild --rebuild --target $(MODULEARCH) --define "karch $(MODULEARCH)" ocfs2-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
+	rpmbuild --rebuild --target $(MODULEARCH) ocfs2-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(RPM_VERSION).src.rpm
 
 
 #

Modified: trunk/vendor/redhat/ocfs2-2.6.9-EL.spec-generic.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.6.9-EL.spec-generic.in	2005-01-25 01:13:34 UTC (rev 1848)
+++ trunk/vendor/redhat/ocfs2-2.6.9-EL.spec-generic.in	2005-01-25 07:56:49 UTC (rev 1849)
@@ -14,10 +14,25 @@
 %define buildsmp	1
 %define buildhugemem	1
 
-%ifnarch i686
+%ifarch i686
+%define karch i686
+%endif
+
+%ifarch x86_64
+%define karch x86_64
 %define buildhugemem	0
 %endif
 
+%ifarch ia32e
+%define karch ia32e
+%define buildhugemem	0
+%endif
+
+%ifarch ia64
+%define karch ia64
+%define buildhugemem	0
+%endif
+
 %define base		2.6.9
 %define sver		%{generic}
 %define kver		%{base}-%{sver}.EL