[Ocfs2-commits] manish commits r1465 - in trunk: . vendor/suse

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-13 17:36:52 -0500 (Mon, 13 Sep 2004)
New Revision: 1465

Modified:
   trunk/Makefile
   trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
Log:
Working SLES9 rpm support


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2004-09-13 21:49:09 UTC (rev 1464)
+++ trunk/Makefile	2004-09-13 22:36:52 UTC (rev 1465)
@@ -51,6 +51,22 @@
 ul10sp3_%_rpm: ul10sp3_%_srpm
 	rpm --rebuild --target i586 "ocfs2-2.4.21-$(patsubst ul10sp3_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
 
+
+# SLES
+#
+$(TOPDIR)/vendor/suse/ocfs2-2.6.5-%.spec: $(TOPDIR)/vendor/suse/ocfs2-2.6.5.spec-generic
+	SPECVER="$@"; \
+		SPECVER="$${SPECVER#*ocfs2-2.6.5-}"; \
+		SPECVER="$${SPECVER%.spec}"; \
+		sed -e 's/^%define sver.*%{generic}$$/%define sver		'$${SPECVER}'/' < $< > $@
+
+sles9_%_srpm: dist $(TOPDIR)/vendor/suse/ocfs2-2.6.5-%.spec
+	rpmbuild -bs --define "_sourcedir `pwd`" --define "_srcrpmdir `pwd`" $(TOPDIR)/vendor/suse/ocfs2-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
+
+sles9_%_rpm: sles9_%_srpm
+	rpmbuild --rebuild --target x86_64 "ocfs2-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(RPM_VERSION).src.rpm"
+
+
 distclean: clean
 	rm -f Config.make config.status config.cache config.log
 

Modified: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2004-09-13 21:49:09 UTC (rev 1464)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2004-09-13 22:36:52 UTC (rev 1465)
@@ -20,25 +20,41 @@
 %define builds390		0
 %define builds390x		0
 
+%ifarch %{ix86}
+%define karch i386
+%endif
+
+%ifarch x86_64
+%define karch x86_64
+%endif
+
 %ifarch ia64
+%define karch ia64
+
 %define buildsmp		0
 %define build64kpagesize	1
 %define buildsn2		1
 %endif
 
 %ifarch ppc
+%define karch ppc
+
 %define buildiseries64		1
 %define buildpmac64		1
 %define buildpseries64		1
 %endif
 
 %ifarch s390
+%define karch s390
+
 %define builddefault		0
 %define buildsmp		0
 %define builds390		1
 %endif
 
 %ifarch s390x
+%define karch s390x
+
 %define builddefault		0
 %define buildsmp		0
 %define builds390x		1
@@ -89,7 +105,7 @@
 Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
-%description deflt
+%description default
 The Oracle Cluster Filesystem Version 2.
 This package is compiled for the default kernel.
 %endif
@@ -230,7 +246,7 @@
 %build
 
 %if %{builddefault}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/default"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/default"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -240,7 +256,7 @@
 %endif
 
 %if %{buildsmp}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/smp"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/smp"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -250,7 +266,7 @@
 %endif
 
 %if %{build64kpagesize}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/64k-pagesize"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/64k-pagesize"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -260,7 +276,7 @@
 %endif
 
 %if %{buildsn2}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/sn2"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/sn2"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -270,7 +286,7 @@
 %endif
 
 %if %{buildiseries64}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/iseries64"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/iseries64"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -280,7 +296,7 @@
 %endif
 
 %if %{buildpmac64}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/pmac64"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/pmac64"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -290,7 +306,7 @@
 %endif
 
 %if %{buildpseries64}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/pseries64"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/pseries64"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -300,7 +316,7 @@
 %endif
 
 %if %{builds390}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/s390"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/s390"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1
@@ -310,7 +326,7 @@
 %endif
 
 %if %{builds390x}
-KPATH="/usr/src/linux-%{kver}-obj/%{arch}/s390x"
+KPATH="/usr/src/linux-%{kver}-obj/%{_target_cpu}/s390x"
 %configure --with-kernel="${KPATH}"
 cd src
 make QUIET=1