[Oracleasm-commits] jlbec commits r326 - in trunk/vendor: . rhas21
rhel3 sles8
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Nov 22 13:42:19 CST 2005
Author: jlbec
Date: 2005-11-22 13:42:18 -0600 (Tue, 22 Nov 2005)
New Revision: 326
Added:
trunk/vendor/rhas21/
trunk/vendor/rhas21/Makefile
trunk/vendor/rhas21/Vendor.make
trunk/vendor/rhas21/rpmarch.guess
trunk/vendor/rhas21/vendor.guess
trunk/vendor/rhel3/
trunk/vendor/rhel3/Makefile
trunk/vendor/rhel3/Vendor.make
trunk/vendor/rhel3/rpmarch.guess
trunk/vendor/rhel3/vendor.guess
trunk/vendor/sles8/
trunk/vendor/sles8/Makefile
trunk/vendor/sles8/Vendor.make
trunk/vendor/sles8/rpmarch.guess
trunk/vendor/sles8/vendor.guess
Modified:
trunk/vendor/Makefile
Log:
o Add rhel3, sles8, and rhas21 vendors
Modified: trunk/vendor/Makefile
===================================================================
--- trunk/vendor/Makefile 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/Makefile 2005-11-22 19:42:18 UTC (rev 326)
@@ -11,7 +11,7 @@
#
# Add any directories to recurse into via the SUBDIRS variable.
#
-SUBDIRS = common rhel4 sles9
+SUBDIRS = common rhel4 sles9 rhel3 sles8 rhas21
#
# Include this at the very end of the Makefile
Added: trunk/vendor/rhas21/Makefile
===================================================================
--- trunk/vendor/rhas21/Makefile 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhas21/Makefile 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,10 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+DIST_FILES = \
+ rpmarch.guess \
+ Vendor.make \
+ vendor.guess
+
+include $(TOPDIR)/Postamble.make
Added: trunk/vendor/rhas21/Vendor.make
===================================================================
--- trunk/vendor/rhas21/Vendor.make 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhas21/Vendor.make 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,9 @@
+#
+# RHEL 3
+#
+
+TOOLSARCH = $(shell $(TOPDIR)/vendor/rhas21/rpmarch.guess tools $(TOPDIR))
+
+include $(TOPDIR)/vendor/common/Vendor.make
+
+packages: support_rpm
Added: trunk/vendor/rhas21/rpmarch.guess
===================================================================
--- trunk/vendor/rhas21/rpmarch.guess 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhas21/rpmarch.guess 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,68 @@
+#! /bin/sh
+
+mode="$1"
+srcdir="$2"
+
+host_cpu=
+
+
+QUERYFILE=/etc/redhat-release
+
+if test -n "$QUERYFILE"; then
+ host_cpu="`rpm -qf $QUERYFILE --queryformat \"%{ARCH}\"`"
+fi
+
+if test -z "$host_cpu" -o "$host_cpu" = "noarch" ; then
+ host_alias=`$srcdir/config.guess`
+ host=`$srcdir/config.sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+fi
+
+case "$host_cpu" in
+ x86_64|ia64|s390x)
+ TOOLSARCH="$host_cpu"
+ ;;
+ i386|i486|i586|i686|i786|k6|k7)
+ TOOLSARCH="i386"
+ ;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ TOOLSARCH="ppc64"
+ ;;
+ *)
+ echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
+ TOOLSARCH=""
+ ;;
+esac
+
+# Only a few of these need to be overwritten from RPM's default
+case "$host_cpu" in
+ i386|i586)
+ MODULEARCH="i686"
+ ;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ MODULEARCH="ppc64"
+ ;;
+ *)
+ MODULEARCH=""
+ ;;
+esac
+
+case "$mode" in
+ module)
+ if [ -n "$MODULEARCH" ] ; then
+ echo "--target $MODULEARCH"
+ fi
+ ;;
+ tools)
+ if [ -n "$TOOLSARCH" ] ; then
+ echo "--target $TOOLSARCH"
+ fi
+ ;;
+ *)
+ echo "rpmarch.guess: Invalid mode: $mode" >&2
+ echo "error"
+ exit 1
+ ;;
+esac
+
+exit 0
Property changes on: trunk/vendor/rhas21/rpmarch.guess
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/vendor/rhas21/vendor.guess
===================================================================
--- trunk/vendor/rhas21/vendor.guess 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhas21/vendor.guess 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -f /etc/redhat-release ]
+then
+ exit 1
+fi
+
+if [ "`rpm -qf /etc/redhat-release --qf '%{VERSION}' 2>/dev/null`" != "2.1AS" ]
+then
+ exit 1
+fi
+
+exit 0
Property changes on: trunk/vendor/rhas21/vendor.guess
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/vendor/rhel3/Makefile
===================================================================
--- trunk/vendor/rhel3/Makefile 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhel3/Makefile 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,10 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+DIST_FILES = \
+ rpmarch.guess \
+ Vendor.make \
+ vendor.guess
+
+include $(TOPDIR)/Postamble.make
Added: trunk/vendor/rhel3/Vendor.make
===================================================================
--- trunk/vendor/rhel3/Vendor.make 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhel3/Vendor.make 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,9 @@
+#
+# RHEL 3
+#
+
+TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel3/rpmarch.guess tools $(TOPDIR))
+
+include $(TOPDIR)/vendor/common/Vendor.make
+
+packages: support_rpm
Added: trunk/vendor/rhel3/rpmarch.guess
===================================================================
--- trunk/vendor/rhel3/rpmarch.guess 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhel3/rpmarch.guess 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,68 @@
+#! /bin/sh
+
+mode="$1"
+srcdir="$2"
+
+host_cpu=
+
+
+QUERYFILE=/etc/redhat-release
+
+if test -n "$QUERYFILE"; then
+ host_cpu="`rpm -qf $QUERYFILE --queryformat \"%{ARCH}\"`"
+fi
+
+if test -z "$host_cpu" -o "$host_cpu" = "noarch" ; then
+ host_alias=`$srcdir/config.guess`
+ host=`$srcdir/config.sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+fi
+
+case "$host_cpu" in
+ x86_64|ia64|s390x)
+ TOOLSARCH="$host_cpu"
+ ;;
+ i386|i486|i586|i686|i786|k6|k7)
+ TOOLSARCH="i386"
+ ;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ TOOLSARCH="ppc64"
+ ;;
+ *)
+ echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
+ TOOLSARCH=""
+ ;;
+esac
+
+# Only a few of these need to be overwritten from RPM's default
+case "$host_cpu" in
+ i386|i586)
+ MODULEARCH="i686"
+ ;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ MODULEARCH="ppc64"
+ ;;
+ *)
+ MODULEARCH=""
+ ;;
+esac
+
+case "$mode" in
+ module)
+ if [ -n "$MODULEARCH" ] ; then
+ echo "--target $MODULEARCH"
+ fi
+ ;;
+ tools)
+ if [ -n "$TOOLSARCH" ] ; then
+ echo "--target $TOOLSARCH"
+ fi
+ ;;
+ *)
+ echo "rpmarch.guess: Invalid mode: $mode" >&2
+ echo "error"
+ exit 1
+ ;;
+esac
+
+exit 0
Property changes on: trunk/vendor/rhel3/rpmarch.guess
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/vendor/rhel3/vendor.guess
===================================================================
--- trunk/vendor/rhel3/vendor.guess 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/rhel3/vendor.guess 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -f /etc/redhat-release ]
+then
+ exit 1
+fi
+
+if [ "`rpm -qf /etc/redhat-release --qf '%{VERSION}' 2>/dev/null`" != "3AS" ]
+then
+ exit 1
+fi
+
+exit 0
Property changes on: trunk/vendor/rhel3/vendor.guess
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/vendor/sles8/Makefile
===================================================================
--- trunk/vendor/sles8/Makefile 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/sles8/Makefile 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,10 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+DIST_FILES = \
+ rpmarch.guess \
+ Vendor.make \
+ vendor.guess
+
+include $(TOPDIR)/Postamble.make
Added: trunk/vendor/sles8/Vendor.make
===================================================================
--- trunk/vendor/sles8/Vendor.make 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/sles8/Vendor.make 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,10 @@
+#
+# SLES 9
+#
+
+TOOLSARCH = $(shell $(TOPDIR)/vendor/sles8/rpmarch.guess tools $(TOPDIR))
+
+
+include $(TOPDIR)/vendor/common/Vendor.make
+
+packages: support_rpm
Added: trunk/vendor/sles8/rpmarch.guess
===================================================================
--- trunk/vendor/sles8/rpmarch.guess 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/sles8/rpmarch.guess 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,70 @@
+#! /bin/sh
+
+mode="$1"
+srcdir="$2"
+
+host_cpu=
+
+QUERYFILE=/etc/SuSE-release
+
+if test -n "$QUERYFILE"; then
+ host_cpu="`rpm -qf $QUERYFILE --queryformat \"%{ARCH}\"`"
+fi
+
+if test -z "$host_cpu" -o "$host_cpu" = "noarch" ; then
+ host_alias=`$srcdir/config.guess`
+ host=`$srcdir/config.sub $host_alias`
+ host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+fi
+
+case "$host_cpu" in
+ x86_64|ia64|s390x)
+ TOOLSARCH="$host_cpu"
+ ;;
+ i386|i486|i586|i686|i786|k6|k7)
+ TOOLSARCH="i386"
+ ;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ TOOLSARCH="ppc64"
+ ;;
+ *)
+ echo "rpmarch.guess: Warning: unknown RPM CPU architecture: $host_cpu" >&2
+ TOOLSARCH=""
+ ;;
+esac
+
+# Only a few of these need to be overwritten from RPM's default
+case "$host_cpu" in
+ i586)
+ MODULEARCH="$host_cpu"
+ ;;
+ i386|i686)
+ MODULEARCH="i586"
+ ;;
+ ppc|ppc64|ppciseries|ppcpseries|ppc64iseries|ppc64pseries|powerpc|powerpc64)
+ MODULEARCH="ppc64"
+ ;;
+ *)
+ MODULEARCH=""
+ ;;
+esac
+
+case "$mode" in
+ module)
+ if [ -n "$MODULEARCH" ] ; then
+ echo "--target $MODULEARCH"
+ fi
+ ;;
+ tools)
+ if [ -n "$TOOLSARCH" ] ; then
+ echo "--target $TOOLSARCH"
+ fi
+ ;;
+ *)
+ echo "rpmarch.guess: Invalid mode: $mode" >&2
+ echo "error"
+ exit 1
+ ;;
+esac
+
+exit 0
Property changes on: trunk/vendor/sles8/rpmarch.guess
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/vendor/sles8/vendor.guess
===================================================================
--- trunk/vendor/sles8/vendor.guess 2005-11-22 06:42:34 UTC (rev 325)
+++ trunk/vendor/sles8/vendor.guess 2005-11-22 19:42:18 UTC (rev 326)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ ! -f /etc/SuSE-release ]
+then
+ exit 1
+fi
+
+if [ "`rpm -qf /etc/SuSE-release --qf '%{VERSION}' 2>/dev/null`" != "8" ]
+then
+ exit 1
+fi
+
+exit 0
Property changes on: trunk/vendor/sles8/vendor.guess
___________________________________________________________________
Name: svn:executable
+ *
More information about the Oracleasm-commits
mailing list