[Oracleasm-commits] jlbec commits r311 - in branches/ppc64: .
vendor/common vendor/redhat vendor/suse
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Sep 7 18:04:00 CDT 2005
Author: jlbec
Date: 2005-09-07 18:03:58 -0500 (Wed, 07 Sep 2005)
New Revision: 311
Modified:
branches/ppc64/configure.in
branches/ppc64/rpmarch.guess
branches/ppc64/vendor/common/oracleasm-support.spec.in
branches/ppc64/vendor/redhat/oracleasm-2.6.9-EL.spec-generic.in
branches/ppc64/vendor/suse/oracleasm-2.6.5.spec-generic.in
Log:
o Maybe working?
Modified: branches/ppc64/configure.in
===================================================================
--- branches/ppc64/configure.in 2005-09-07 22:57:38 UTC (rev 310)
+++ branches/ppc64/configure.in 2005-09-07 23:03:58 UTC (rev 311)
@@ -17,9 +17,9 @@
#
MAJOR_VERSION=2
MINOR_VERSION=0
-MICRO_VERSION=1
-INTERFACE_AGE=1
-BINARY_AGE=1
+MICRO_VERSION=0
+INTERFACE_AGE=0
+BINARY_AGE=0
VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
@@ -94,14 +94,14 @@
if test -z "$TOOLSARCH"
then
case "$host_cpu" in
- x86_64|i386|ppc|ia64)
+ x86_64|ia64|s390x)
TOOLSARCH="$host_cpu"
;;
- i686|i586|i486)
+ i386|i686|i586|i486)
TOOLSARCH="i386"
;;
- ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
- TOOLSARCH="ppc"
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ TOOLSARCH="ppc64"
;;
*)
AC_MSG_RESULT([not found])
@@ -110,7 +110,7 @@
esac
fi
case "$TOOLSARCH" in
-x86_64|ia64)
+x86_64|ia64|ppc64)
MODULEARCH="$TOOLSARCH"
;;
ppc)
Modified: branches/ppc64/rpmarch.guess
===================================================================
--- branches/ppc64/rpmarch.guess 2005-09-07 22:57:38 UTC (rev 310)
+++ branches/ppc64/rpmarch.guess 2005-09-07 23:03:58 UTC (rev 311)
@@ -25,14 +25,14 @@
fi
case "$host_cpu" in
- x86_64|ppc|ia64|s390x)
- TOOLSARCH=""
+ x86_64|ia64|s390x)
+ TOOLSARCH="$host_cpu"
;;
i386|i486|i586|i686|i786|k6|k7)
TOOLSARCH="i386"
;;
- ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
- TOOLSARCH="ppc"
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ TOOLSARCH="ppc64"
;;
*)
echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
@@ -48,6 +48,9 @@
i386)
MODULEARCH="i686"
;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ MODULEARCH="ppc64"
+ ;;
*)
MODULEARCH=""
;;
Modified: branches/ppc64/vendor/common/oracleasm-support.spec.in
===================================================================
--- branches/ppc64/vendor/common/oracleasm-support.spec.in 2005-09-07 22:57:38 UTC (rev 310)
+++ branches/ppc64/vendor/common/oracleasm-support.spec.in 2005-09-07 23:03:58 UTC (rev 311)
@@ -40,7 +40,21 @@
%build
-%configure --sbindir=/usr/sbin
+./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} \
+ --sbindir=/usr/sbin
cd tools
make
Modified: branches/ppc64/vendor/redhat/oracleasm-2.6.9-EL.spec-generic.in
===================================================================
--- branches/ppc64/vendor/redhat/oracleasm-2.6.9-EL.spec-generic.in 2005-09-07 22:57:38 UTC (rev 310)
+++ branches/ppc64/vendor/redhat/oracleasm-2.6.9-EL.spec-generic.in 2005-09-07 23:03:58 UTC (rev 311)
@@ -22,17 +22,21 @@
%define buildhugemem 0
%endif
-%ifarch ia32e
-%define karch ia32e
-%endif
-
%ifarch ia64
%define karch ia64
%define buildsmp 0
%define buildhugemem 0
%endif
+%ifarch ppc64
+%define karch ppc64
+%define buildsmp 0
+%define buildhugemem 0
+%endif
+
+
+
# This must be changed to the minimum ABI compat kernel version expected
%define base 2.6.9
%define sver %{generic}
@@ -105,9 +109,28 @@
%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-kernel="$1"
+}
+
%if %{buildup}
KPATH="/usr/src/kernels/%{kver}-%{karch}"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -123,7 +146,7 @@
%if %{buildsmp}
KPATH="/usr/src/kernels/%{kver}-smp-%{karch}"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -139,7 +162,7 @@
%if %{buildhugemem}
KPATH="/usr/src/kernels/%{kver}-hugemem-%{karch}"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
Modified: branches/ppc64/vendor/suse/oracleasm-2.6.5.spec-generic.in
===================================================================
--- branches/ppc64/vendor/suse/oracleasm-2.6.5.spec-generic.in 2005-09-07 22:57:38 UTC (rev 310)
+++ branches/ppc64/vendor/suse/oracleasm-2.6.5.spec-generic.in 2005-09-07 23:03:58 UTC (rev 311)
@@ -39,9 +39,11 @@
%define buildsn2 1
%endif
-%ifarch ppc
-%define karch ppc
+%ifarch ppc64
+%define karch ppc64
+%define builddefault 0
+%define buildsmp 0
%define buildbigsmp 0
%define buildiseries64 1
%define buildpmac64 1
@@ -58,7 +60,7 @@
%endif
%ifarch s390x
-%define karch s390x
+%define karch s390
%define builddefault 0
%define buildsmp 0
@@ -267,9 +269,28 @@
%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-kernel="$1"
+}
+
%if %{builddefault}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/default"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -284,7 +305,7 @@
%if %{buildsmp}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/smp"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -299,7 +320,7 @@
%if %{buildbigsmp}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/bigsmp"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -314,7 +335,7 @@
%if %{build64kpagesize}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/64k-pagesize"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -329,7 +350,7 @@
%if %{buildsn2}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/sn2"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -344,7 +365,7 @@
%if %{buildiseries64}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/iseries64"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -359,7 +380,7 @@
%if %{buildpmac64}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pmac64"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -374,7 +395,7 @@
%if %{buildpseries64}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/pseries64"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -389,7 +410,7 @@
%if %{builds390}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
@@ -404,7 +425,7 @@
%if %{builds390x}
KPATH="/usr/src/linux-%{kver}-obj/%{karch}/s390x"
-%configure --with-kernel="${KPATH}"
+local_configure "${KPATH}"
make QUIET=1
make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install
More information about the Oracleasm-commits
mailing list