[Oracleasm-commits] jlbec commits r309 - in trunk: . tools

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-06-22 18:31:52 -0500 (Wed, 22 Jun 2005)
New Revision: 309

Added:
   trunk/tools/oracleasm_debug_link
Modified:
   trunk/configure.in
   trunk/tools/Makefile
Log:

o Add oracleasm_debug_link
o Bump version to 2.0.1.



Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-06-22 01:11:18 UTC (rev 308)
+++ trunk/configure.in	2005-06-22 23:31:52 UTC (rev 309)
@@ -17,9 +17,9 @@
 #
 MAJOR_VERSION=2
 MINOR_VERSION=0
-MICRO_VERSION=0
-INTERFACE_AGE=0
-BINARY_AGE=0
+MICRO_VERSION=1
+INTERFACE_AGE=1
+BINARY_AGE=1
 VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
 AC_SUBST(MAJOR_VERSION)
 AC_SUBST(MINOR_VERSION)

Modified: trunk/tools/Makefile
===================================================================
--- trunk/tools/Makefile	2005-06-22 01:11:18 UTC (rev 308)
+++ trunk/tools/Makefile	2005-06-22 23:31:52 UTC (rev 309)
@@ -3,6 +3,7 @@
 include $(TOPDIR)/Preamble.make
 
 SBIN_PROGRAMS = asmtool asmscan
+SBIN_EXTRA = oracleasm_debug_link
 
 VERSION_FLAGS = -DVERSION="\"${VERSION}\""
 CPPFLAGS += -DLINUX ${VERSION_FLAGS} $(DEFS)

Added: trunk/tools/oracleasm_debug_link
===================================================================
--- trunk/tools/oracleasm_debug_link	2005-06-22 01:11:18 UTC (rev 308)
+++ trunk/tools/oracleasm_debug_link	2005-06-22 23:31:52 UTC (rev 309)
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+
+PROGNAME=$(basename $0)
+
+# The module path is the path underneath /lib/modules/`uname -r`.
+# Do _not_ include .o or .ko here.  The extension will be detected.
+# This can be a directory to symlink and entire subtree.
+MODULEPATH="kernel/drivers/addon/oracleasm/oracleasm"
+
+
+FORCE=
+
+print_usage()
+{
+    echo "Usage: ${PROGNAME} [-f] <module_version> [<debug_kernel_version>]" >&2
+    echo "       ${PROGNAME} -h" >&2
+    exit 1
+}
+
+while getopts ":fh" opt
+do
+    case "$opt" in 
+    f)
+        FORCE=true
+        ;;
+    h)
+        print_usage
+        ;;
+    ":")
+        echo "${PROGNAME}: Option '-${OPTARG}' requires an argument" >&2
+        print_usage
+        ;;
+    "?")
+        echo "${PROGNAME}: Unknown option: '-${OPTARG}'" >&2
+        print_usage
+        ;;
+    *)
+        echo "${PROGNAME}: What the?  Option parsing" >&2
+        print_usage
+        ;;
+    esac
+done
+
+shift $(expr ${OPTIND} - 1)
+     
+OLDVERSION="$1"
+shift
+if [ -z "$OLDVERSION" ]
+then
+    echo "${PROGNAME}: No original driver specified" >&2
+    print_usage
+fi
+
+case "$OLDVERSION" in
+*/*)
+    OLDMODULEPATH="$OLDVERSION"
+    EXTENSION=
+    ;;
+*)
+    OLDMODULEPATH="/lib/modules/${OLDVERSION}/${MODULEPATH}"
+    if [ -e "${OLDMODULEPATH}.ko" ]
+    then
+        EXTENSION=".ko"
+    elif [ -e "${OLDMODULEPATH}.o" ]
+    then
+        EXTENSION=".o"
+    elif [ -d "${OLDMODULEPATH}" ]
+    then
+        EXTENSION=
+    else
+        echo "No driver exists for old version ${OLDVERSION}" >&2
+        exit 1
+    fi
+    OLDMODULEPATH="${OLDMODULEPATH}${EXTENSION}"
+    ;;
+esac
+
+NEWVERSION="$1"
+shift
+if [ -z "$NEWVERSION" ]
+then
+    NEWVERSION="$(uname -r)"
+fi
+  
+case "$NEWVERSION" in
+*/*)
+    NEWMODULEPATH="$NEWVERSION"
+    ;;
+*)
+    NEWMODULEPATH="/lib/modules/${NEWVERSION}/${MODULEPATH}${EXTENSION}"
+    ;;
+esac
+
+LINKED=false
+if [ -e "${NEWMODULEPATH}" ]
+then
+    if [ -L "${NEWMODULEPATH}" -a "$FORCE" = "true" ]
+    then
+        ln -sf "${OLDMODULEPATH}" "${NEWMODULEPATH}"
+        if [ $? = 0 ]
+        then
+            LINKED=true
+        fi
+    else
+        echo "${PROGNAME}: Target exists" >&2
+        exit 1
+    fi
+else
+    mkdir -p "$(dirname "${NEWMODULEPATH}")"
+    if [ $? = 0 ]
+    then
+        ln -s "${OLDMODULEPATH}" "${NEWMODULEPATH}"
+        if [ $? = 0 ]
+        then
+            LINKED=true
+        fi
+    fi
+fi
+
+if [ "$LINKED" = "true" ]
+then
+    case "$NEWVERSION" in
+    /lib/modules/*)
+        NEWVERSION="${NEWVERSION#/lib/modules/}"
+        NEWVERSION="${NEWVERSION%%/*}"
+        ;;
+    */*)
+        # It's an absolute path of unknown origin.  Assume this kernel.
+        NEWVERSION="$(uname -r)"
+        ;;
+    *)
+        ;;
+    esac
+
+    depmod -ae "$NEWVERSION"
+fi


Property changes on: trunk/tools/oracleasm_debug_link
___________________________________________________________________
Name: svn:executable
   + *