Blame SOURCES/bltk-1.0.9-bltk_paths.patch

983249
--- orig-1.0.9/tools/analyzer/bltk_plot.sh	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_plot.sh	2009-07-17 11:03:54.822883564 +0200
983249
@@ -41,23 +41,41 @@
983249
 
983249
 unalias -a
983249
 
983249
-set_bltk_root()
983249
+set_bltk_paths()
983249
 {
983249
-	PROG=`basename $0`
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
 
983249
-	BLTK_ROOT=`dirname $0`
983249
-	if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-	then
983249
-		BLTK_ROOT=`dirname $BLTK_ROOT`
983249
-		if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-		then
983249
-			echo "Cannot determine bltk root, bltk tree corrupted."
983249
-			exit 2
983249
-		fi
983249
-	fi
983249
-	export BLTK_ROOT
983249
-	export BLTK_BIN=$BLTK_ROOT/bin
983249
-	export BLTK_TMP=$BLTK_ROOT/tmp
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
 }
983249
 
983249
 set_bltk_root
983249
--- orig-1.0.9/tools/analyzer/bltk_report_check.sh	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_report_check.sh	2009-07-17 11:03:54.824880651 +0200
983249
@@ -41,26 +41,44 @@
983249
 
983249
 unalias -a
983249
 
983249
-set_bltk_root()
983249
+set_bltk_paths()
983249
 {
983249
-	PROG=`basename $0`
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
 
983249
-	BLTK_ROOT=`dirname $0`
983249
-	if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-	then
983249
-		BLTK_ROOT=`dirname $BLTK_ROOT`
983249
-		if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-		then
983249
-			echo "Cannot determine bltk root, bltk tree corrupted."
983249
-			exit 2
983249
-		fi
983249
-	fi
983249
-	export BLTK_ROOT
983249
-	export BLTK_BIN=$BLTK_ROOT/bin
983249
-	export BLTK_TMP=$BLTK_ROOT/tmp
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
 }
983249
 
983249
-set_bltk_root
983249
+set_bltk_paths
983249
 
983249
 Failed="Failed !!!"
983249
 
983249
--- orig-1.0.9/tools/analyzer/bltk_report_compress.sh	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_report_compress.sh	2009-07-17 11:03:54.818881008 +0200
983249
@@ -41,27 +41,44 @@
983249
 
983249
 unalias -a
983249
 
983249
-set_bltk_root()
983249
+set_bltk_paths()
983249
 {
983249
-	PROG=`basename $0`
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
 
983249
-	BLTK_ROOT=`dirname $0`
983249
-	if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-	then
983249
-		BLTK_ROOT=`dirname $BLTK_ROOT`
983249
-		if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-		then
983249
-			echo "Cannot determine bltk root, bltk tree corrupted."
983249
-			exit 2
983249
-		fi
983249
-	fi
983249
-	export BLTK_ROOT
983249
-	export BLTK_BIN=$BLTK_ROOT/bin
983249
-	export BLTK_TMP=$BLTK_ROOT/tmp
983249
-	export BLTK_GET_REALPATH=$BLTK_BIN/bltk_get_realpath
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
 }
983249
 
983249
-set_bltk_root
983249
+set_bltk_paths
983249
 
983249
 CWD=$PWD
983249
 
983249
--- orig-1.0.9/tools/analyzer/bltk_report.sh	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_report.sh	2009-07-17 11:03:54.820880959 +0200
983249
@@ -38,29 +38,51 @@
983249
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
983249
 #
983249
 
983249
-
983249
 unalias -a
983249
 
983249
-set_bltk_root()
983249
+set_bltk_paths()
983249
 {
983249
-	PROG=`basename $0`
983249
-
983249
-	BLTK_ROOT=`dirname $0`
983249
-	if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-	then
983249
-		BLTK_ROOT=`dirname $BLTK_ROOT`
983249
-		if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-		then
983249
-			echo "Cannot determine bltk root, bltk tree corrupted."
983249
-			exit 2
983249
-		fi
983249
-	fi
983249
-	export BLTK_ROOT
983249
-	export BLTK_BIN=$BLTK_ROOT/bin
983249
-	export BLTK_TMP=$BLTK_ROOT/tmp
983249
-}
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
 
983249
-set_bltk_root
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
+}
983249
+
983249
+set_bltk_paths
983249
+
983249
+if [ ! $? = 0 ]; then
983249
+  echo "ERROR in setting environmental paths" >&2
983249
+  exit 1
983249
+fi
983249
 
983249
 BLTK_GET_STAT_CMD="$BLTK_BIN/bltk_get_stat $stat_ign_lines_arg"
983249
 BLTK_CALC_CMD=$BLTK_BIN/bltk_calc
983249
--- orig-1.0.9/tools/analyzer/bltk_report_table.sh	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_report_table.sh	2009-07-17 11:03:54.823880990 +0200
983249
@@ -41,26 +41,44 @@
983249
 
983249
 unalias -a
983249
 
983249
-set_bltk_root()
983249
+set_bltk_paths()
983249
 {
983249
-	PROG=`basename $0`
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
 
983249
-	BLTK_ROOT=`dirname $0`
983249
-	if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-	then
983249
-		BLTK_ROOT=`dirname $BLTK_ROOT`
983249
-		if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-		then
983249
-			echo "Cannot determine bltk root, bltk tree corrupted."
983249
-			exit 2
983249
-		fi
983249
-	fi
983249
-	export BLTK_ROOT
983249
-	export BLTK_BIN=$BLTK_ROOT/bin
983249
-	export BLTK_TMP=$BLTK_ROOT/tmp
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
 }
983249
 
983249
-set_bltk_root
983249
+set_bltk_paths
983249
 
983249
 BLTK_REPORT=$BLTK_BIN/bltk_report
983249
 
983249
--- orig-1.0.9/tools/analyzer/bltk_report_uncompress.sh	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_report_uncompress.sh	2009-07-17 11:03:54.837880784 +0200
983249
@@ -41,27 +41,44 @@
983249
 
983249
 unalias -a
983249
 
983249
-set_bltk_root()
983249
+set_bltk_paths()
983249
 {
983249
-	PROG=`basename $0`
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
 
983249
-	BLTK_ROOT=`dirname $0`
983249
-	if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-	then
983249
-		BLTK_ROOT=`dirname $BLTK_ROOT`
983249
-		if [[ ! -a $BLTK_ROOT/.bltk ]]
983249
-		then
983249
-			echo "Cannot determine bltk root, bltk tree corrupted."
983249
-			exit 2
983249
-		fi
983249
-	fi
983249
-	export BLTK_ROOT
983249
-	export BLTK_BIN=$BLTK_ROOT/bin
983249
-	export BLTK_TMP=$BLTK_ROOT/tmp
983249
-	export BLTK_GET_REALPATH=$BLTK_BIN/bltk_get_realpath
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
 }
983249
 
983249
-set_bltk_root
983249
+set_bltk_paths
983249
 
983249
 CWD=$PWD
983249
 
983249
--- orig-1.0.9/tools/analyzer/bltk_func.sh	1970-01-01 01:00:00.000000000 +0100
983249
+++ curr-1.0.9-1/tools/analyzer/bltk_func.sh	2009-07-17 11:03:54.824880651 +0200
983249
@@ -0,0 +1,77 @@
983249
+#!/bin/bash
983249
+#
983249
+# Copyright (c) 2009 Red Hat Inc.
983249
+# Copyright (c) 2009 Jiri Skala <jskala@redhat.com>
983249
+# All rights reserved.
983249
+#
983249
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
983249
+#
983249
+# Redistribution and use in source and binary forms, with or without
983249
+# modification, are permitted provided that the following conditions
983249
+# are met:
983249
+#
983249
+#   Redistributions of source code must retain the above copyright notice,
983249
+#   this list of conditions and the following disclaimer.
983249
+#
983249
+#   Redistributions in binary form must reproduce the above copyright
983249
+#   notice, this list of conditions and the following disclaimer in the
983249
+#   documentation and/or other materials provided with the distribution.
983249
+#
983249
+#   Neither the name of Intel Corporation nor the names of its contributors
983249
+#   may be used to endorse or promote products derived from this software
983249
+#   without specific prior written permission.
983249
+#
983249
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
983249
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
983249
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
983249
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
983249
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
983249
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
983249
+#
983249
+# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
983249
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
983249
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
983249
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
983249
+# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
983249
+# DAMAGE.
983249
+#
983249
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
983249
+#
983249
+
983249
+set_bltk_paths()
983249
+{
983249
+  WHICH_BLTK=`which bltk`
983249
+  RETCODE=$?
983249
+
983249
+  if [[ $RETCODE = 0 ]]
983249
+  then
983249
+    file -b $WHICH_BLTK | grep symbolic > /dev/null
983249
+    TMPCODE=$?
983249
+    if [[ $TMPCODE = 0 ]]
983249
+    then
983249
+      BLTK_MAIN=`readlink -f $WHICH_BLTK`
983249
+    else
983249
+      BLTK_MAIN=$WHICH_BLTK
983249
+    fi
983249
+    BLTK_ROOT=`echo $BLTK_MAIN | sed 's|/bin/.*$||'`
983249
+
983249
+    root_len=`echo $BLTK_ROOT | wc -c`
983249
+    main_len=`echo $BLTK_MAIN | wc -c`
983249
+    
983249
+    if [[ $root_len = $main_len ]]
983249
+    then
983249
+      RETCODE=2
983249
+    else
983249
+      [ -f "$BLTK_CONF" ] && . "$BLTK_CONF"
983249
+
983249
+      [ -z $BLTK_HOME ] && BLTK_HOME=~/.bltk
983249
+
983249
+      export BLTK_ROOT
983249
+      export BLTK_BIN=$BLTK_ROOT/bin
983249
+      export BLTK_TMP=$BLTK_HOME/tmp
983249
+    fi
983249
+  fi
983249
+
983249
+  return $RETCODE
983249
+}
983249
+
983249
--- orig-1.0.9/tools/analyzer/Makefile	2009-04-10 09:14:20.000000000 +0200
983249
+++ curr-1.0.9-1/tools/analyzer/Makefile	2009-07-17 11:03:54.826913428 +0200
983249
@@ -15,7 +15,7 @@
983249
 
983249
 SHFILES		= bltk_get_stat bltk_report bltk_report_table bltk_report_check \
983249
 			bltk_plot bltk_get_hd_rpm \
983249
-			bltk_report_compress bltk_report_uncompress
983249
+			bltk_report_compress bltk_report_uncompress bltk_func
983249
 SHFILES_SH	= ${SHFILES:=.sh}
983249
 SHTARGETS	= $(SHFILES:%=$(BIN)/%)
983249