[Oracleasm-commits] jlbec commits r317 - in trunk: . vendor/rhel4 vendor/sles9

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-11-20 04:15:54 -0600 (Sun, 20 Nov 2005)
New Revision: 317

Added:
   trunk/vendor/rhel4/rpmarch.guess
   trunk/vendor/sles9/rpmarch.guess
Removed:
   trunk/rpmarch.guess
Modified:
   trunk/vendor/rhel4/Vendor.make
   trunk/vendor/sles9/Vendor.make
Log:

o Move RPM architecture guessing to the vendor directories.



Deleted: trunk/rpmarch.guess
===================================================================
--- trunk/rpmarch.guess	2005-11-20 10:09:07 UTC (rev 316)
+++ trunk/rpmarch.guess	2005-11-20 10:15:54 UTC (rev 317)
@@ -1,77 +0,0 @@
-#! /bin/sh
-
-mode="$1"
-srcdir="$2"
-
-host_cpu=
-QUERYFILE=
-
-if test -f /etc/redhat-release ; then
-  QUERYFILE=/etc/redhat-release
-elif test -f /etc/SuSE-release ; then
-  QUERYFILE=/etc/SuSE-release
-elif test -f /etc/UnitedLinux-release ; then
-  QUERYFILE=/etc/UnitedLinux-release
-fi
-
-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)
-    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

Modified: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make	2005-11-20 10:09:07 UTC (rev 316)
+++ trunk/vendor/rhel4/Vendor.make	2005-11-20 10:15:54 UTC (rev 317)
@@ -2,6 +2,9 @@
 # RHEL 4
 #
 
+TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess tools $(TOPDIR))
+MODULEARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess module $(TOPDIR))
+
 $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*oracleasm-2.6.9-}"; \

Copied: trunk/vendor/rhel4/rpmarch.guess (from rev 314, trunk/rpmarch.guess)
===================================================================
--- trunk/rpmarch.guess	2005-11-20 09:48:41 UTC (rev 314)
+++ trunk/vendor/rhel4/rpmarch.guess	2005-11-20 10:15:54 UTC (rev 317)
@@ -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

Modified: trunk/vendor/sles9/Vendor.make
===================================================================
--- trunk/vendor/sles9/Vendor.make	2005-11-20 10:09:07 UTC (rev 316)
+++ trunk/vendor/sles9/Vendor.make	2005-11-20 10:15:54 UTC (rev 317)
@@ -2,6 +2,10 @@
 # SLES 9
 #
 
+TOOLSARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess tools $(TOPDIR))
+MODULEARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess module $(TOPDIR))
+
+
 $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec: $(TOPDIR)/vendor/sles9/oracleasm-2.6.5.spec-generic
 	SPECVER="$@"; \
 		SPECVER="$${SPECVER#*oracleasm-2.6.5-}"; \

Copied: trunk/vendor/sles9/rpmarch.guess (from rev 314, trunk/rpmarch.guess)
===================================================================
--- trunk/rpmarch.guess	2005-11-20 09:48:41 UTC (rev 314)
+++ trunk/vendor/sles9/rpmarch.guess	2005-11-20 10:15:54 UTC (rev 317)
@@ -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