[Ocfs2-commits] jlbec commits r2772 - in branches/ocfs2-1.2/vendor: rhel4 sles9

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


Author: jlbec
Signed-off-by: mfasheh
Date: 2006-02-22 17:05:43 -0600 (Wed, 22 Feb 2006)
New Revision: 2772

Modified:
   branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
   branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
Log:

o Whoops, forgot the specfile updates in the rename.  They now really
  use --with-vendor, etc.

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2006-02-22 23:03:29 UTC (rev 2771)
+++ branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2006-02-22 23:05:43 UTC (rev 2772)
@@ -10,33 +10,33 @@
 
 # Turn ons and offs
 %define buildup		1
+%define buildsmp	0
+%define buildhugemem	0
+
+%ifarch i686
+%define karch		i686
 %define buildsmp	1
 %define buildhugemem	1
-
-%ifarch i686
-%define karch i686
 %endif
 
 %ifarch x86_64
-%define karch x86_64
-%define buildhugemem	0
+%define karch		x86_64
+%define buildsmp	1
 %endif
 
 %ifarch ia64
-%define karch ia64
-%define buildsmp	0
-%define buildhugemem	0
+%define karch		ia64
 %endif
 
+%ifarch ppc64
+%define karch		ppc64
+%endif
+
 %ifarch s390x
-%define karch s390x
-%define buildsmp	0
-%define buildhugemem	0
+%define karch		s390x
 %endif
 
-%define base		2.6.9
-%define sver		%{generic}
-%define kver		%{base}-%{sver}.EL
+%define kver		@@KVER@@
 
 # The minimum tools package required for the kernel bits.
 %define tools_ver     @TOOLS_REQUIRED_VERSION@
@@ -44,7 +44,7 @@
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
 Version: @DIST_VERSION@
-Release: @RPM_VERSION@
+Release: @@PKG_VERSION@@
 Copyright: GPL
 Group: System Environment/Kernel
 Source: ocfs2- at DIST_VERSION@.tar.gz
@@ -103,11 +103,31 @@
 
 
 %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}
-KPATH="/usr/src/kernels/%{kver}-%{karch}"
-%configure --with-kernel="${KPATH}"
+local_configure "%{kver}"
 
-make
+make QUIET=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -125,10 +145,9 @@
 %endif
 
 %if %{buildsmp}
-KPATH="/usr/src/kernels/%{kver}-smp-%{karch}"
-%configure --with-kernel="${KPATH}"
+local_configure "%{kver}smp"
 
-make
+make QUIET=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely
@@ -146,10 +165,9 @@
 %endif
 
 %if %{buildhugemem}
-KPATH="/usr/src/kernels/%{kver}-hugemem-%{karch}"
-%configure --with-kernel="${KPATH}"
+local_configure "%{kver}hugemem"
 
-make
+make QUIET=1
 make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
 
 # 2.6 kbuild can't do this install nicely

Modified: branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2006-02-22 23:03:29 UTC (rev 2771)
+++ branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2006-02-22 23:05:43 UTC (rev 2772)
@@ -40,9 +40,11 @@
 %define buildsn2		1
 %endif
 
-%ifarch ppc
-%define karch ppc
+%ifarch ppc64
+%define karch ppc.
 
+%define builddefault		0
+%define buildsmp		0
 %define buildbigsmp		0
 %define buildiseries64		1
 %define buildpmac64		1
@@ -59,7 +61,7 @@
 %endif
 
 %ifarch s390x
-%define karch s390x
+%define karch s390
 
 %define builddefault		0
 %define buildsmp		0
@@ -68,9 +70,7 @@
 %endif
 
 
-%define base		2.6.5
-%define sver		%{generic}
-%define kver		%{base}-%{sver}
+%define kver		@@KVER@@
 
 # The minimum tools package required for the kernel bits.
 %define tools_ver     @TOOLS_REQUIRED_VERSION@
@@ -78,7 +78,7 @@
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
 Version: @DIST_VERSION@
-Release: @RPM_VERSION@
+Release: @@PKG_VERSION@@
 Copyright: GPL
 Group: System Environment/Kernel
 Source: ocfs2- at DIST_VERSION@.tar.gz
@@ -266,10 +266,29 @@
 
 %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}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/default"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -292,9 +311,9 @@
 %endif
 
 %if %{buildsmp}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/smp"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -317,9 +336,9 @@
 %endif
 
 %if %{buildbigsmp}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/bigsmp"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -342,9 +361,9 @@
 %endif
 
 %if %{build64kpagesize}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/64k-pagesize"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -367,9 +386,9 @@
 %endif
 
 %if %{buildsn2}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/sn2"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -392,9 +411,9 @@
 %endif
 
 %if %{buildiseries64}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/iseries64"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -417,9 +436,9 @@
 %endif
 
 %if %{buildpmac64}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pmac64"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -442,9 +461,9 @@
 %endif
 
 %if %{buildpseries64}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pseries64"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -467,9 +486,9 @@
 %endif
 
 %if %{builds390}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390"
-%configure --with-kernel="${KPATH}"
-make
+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
@@ -492,9 +511,9 @@
 %endif
 
 %if %{builds390x}
-KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390x"
-%configure --with-kernel="${KPATH}"
-make
+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




More information about the Ocfs2-commits mailing list