diff --git a/bltk-1.1.0-rm_sudo.patch b/bltk-1.1.0-rm_sudo.patch index ed81034..7537d89 100644 --- a/bltk-1.1.0-rm_sudo.patch +++ b/bltk-1.1.0-rm_sudo.patch @@ -161,10 +161,24 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_dmidecode.sh.sec_sudo bltk-1.1.0/tools/b -rm -f $TMP_FILE - exit 0 -diff -up bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh ---- bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.orig 2010-08-18 08:35:02.000000000 +0200 -+++ bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh 2012-03-29 16:52:11.881359552 +0200 -@@ -55,7 +55,12 @@ +diff -up bltk/tools/bltk/bltk_get_hdparm.sh.orig bltk/tools/bltk/bltk_get_hdparm.sh +--- bltk/tools/bltk/bltk_get_hdparm.sh.orig 2010-08-18 08:35:02.000000000 +0200 ++++ bltk/tools/bltk/bltk_get_hdparm.sh 2012-05-07 16:22:43.000000000 +0200 +@@ -44,39 +44,64 @@ PROG=$0 + + error() + { +- echo "$PROG: ERROR: $*" >&2 +- exit 1 ++ echo "$PROG: ERROR: $*" >&2 ++ exit 1 + } + + warning() + { +- echo "$PROG: Warning: $*" >&2 ++ echo "$PROG: Warning: $*" >&2 + } PARTITIONS=$1 @@ -173,30 +187,38 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.1.0/tools/bltk TMP_FILE=$BLTK_ROOT/tmp/hdparm +DEV_INFO=$BLTK_HOME/tmp/dev_info + -+/usr/bin/devkit-disks --dump > $TMP_FILE ++/usr/bin/udisksctl dump > $TMP_FILE #str=`df -lk / | grep -v ^Filesystem` str=`df -lk / | grep ^/dev/` -@@ -64,15 +69,35 @@ - realname="`readlink $DF_DEV_NAME`" - DF_NAME="`basename ${realname}`" - HD_NAME=${DF_NAME} + DF_DEV_NAME=${str%% *} +-if [ -L $DF_DEV_NAME ];then +- realname="`readlink $DF_DEV_NAME`" +- DF_NAME="`basename ${realname}`" +- HD_NAME=${DF_NAME} - DISK_CK_TOOL="lvdisplay -a" - HD_DEV_NAME=$DF_DEV_NAME - else - DF_NAME=${DF_DEV_NAME#/dev/} - HD_NAME=${DF_NAME%%[0-9]*} +-else +- DF_NAME=${DF_DEV_NAME#/dev/} +- HD_NAME=${DF_NAME%%[0-9]*} - DISK_CK_TOOL="hdparm -iI" - HD_DEV_NAME=/dev/$HD_NAME ++if [ -L $DF_DEV_NAME ];then ++ realname="`readlink $DF_DEV_NAME`" ++ DF_NAME="`basename ${realname}`" ++ HD_NAME=${DF_NAME} ++else ++ DF_NAME=${DF_DEV_NAME#/dev/} ++ HD_NAME=${DF_NAME%%[0-9]*} fi +HD_DEV_NAME=/dev/$HD_NAME + +while read line +do -+ if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then ++ if [[ $READING -eq 0 && `echo $line | grep '^/'` ]]; then + READING=1 -+ elif [[ $READING -eq 1 && `echo $line | grep =====` ]]; then ++ elif [[ $READING -eq 1 && -z "$line" ]]; then + READING=0 + if [ $FOUND -eq 1 ]; then + break; @@ -209,7 +231,7 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.1.0/tools/bltk + echo $line >> $DEV_INFO + fi + -+ if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then ++ if [[ `echo $line | grep "Device: *$HD_DEV_NAME"` ]]; then + FOUND=1 + fi +done < $TMP_FILE @@ -217,16 +239,20 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.1.0/tools/bltk grep -w "$HD_NAME" "$PARTITIONS" >/dev/null 2>&1 if [[ $? != 0 ]] then -@@ -85,34 +110,17 @@ +- warning "Cannot determine hard disk $HD_NAME statistics" ++ warning "Cannot determine hard disk $HD_NAME statistics" + fi + + echo "DF_NAME = $DF_NAME" +@@ -85,34 +110,17 @@ echo "HD_NAME = $HD_NAME" echo "HD_DEV_NAME = $HD_DEV_NAME" rm -f $TMP_FILE -BLTK_SUDO_CMD=sudo -$BLTK_SUDO_CMD $DISK_CK_TOOL "$HD_DEV_NAME" >$TMP_FILE 2>&1 -if [ -L $DF_DEV_NAME ];then -+if [ -L $DF_DEV_NAME ];then - echo "HD_MODEL = Logical volume" - +- echo "HD_MODEL = Logical volume" +- - str=`grep 'LV Size' $TMP_FILE` - str=${str#*LV Size*} - str=`echo $str` @@ -248,22 +274,40 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_hdparm.sh.sec_sudo bltk-1.1.0/tools/bltk - str=${str#*device size with M = 1000*:} - str=`echo $str` - echo "HD_SIZE = $str" -+ str=`grep '^size:' $DEV_INFO | sed 's/^size: //'` -+ echo "HD_SIZE = $((str/1048576)) MBytes ($((str/1073741824)) GB)" ++if [ -L $DF_DEV_NAME ];then ++ echo "HD_MODEL = Logical volume" ++ ++ str=`grep '^Size:' $DEV_INFO | sed 's/^Size: *//'` ++ echo "HD_SIZE = $((str/1048576)) MBytes ($((str/1073741824)) GB)" +else -+ echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`" -+ str=`grep '^size:' $DEV_INFO | sed 's/^size: //'` -+ echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)" ++ echo "HD_MODEL = `grep '^Model:' $DEV_INFO | sed 's/^Model: *//'`" ++ str=`grep '^Size:' $DEV_INFO | sed 's/^Size: *//'` ++ echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)" fi -rm -f $TMP_FILE +rm -f $DEV_INFO exit 0 -diff -up bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.1.0/tools/bltk/bltk_get_user_field.sh ---- bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo 2009-12-08 14:28:23.826177205 +0100 -+++ bltk-1.1.0/tools/bltk/bltk_get_user_field.sh 2009-12-10 15:58:45.697370853 +0100 -@@ -57,7 +57,12 @@ warning() +diff -up bltk/tools/bltk/bltk_get_user_field.sh.orig bltk/tools/bltk/bltk_get_user_field.sh +--- bltk/tools/bltk/bltk_get_user_field.sh.orig 2012-05-07 16:23:42.925939779 +0200 ++++ bltk/tools/bltk/bltk_get_user_field.sh 2012-05-07 16:22:43.000000000 +0200 +@@ -45,19 +45,24 @@ PROG=$0 + + error() + { +- echo "$PROG: ERROR: $*" >&2 +- exit 1 ++ echo "$PROG: ERROR: $*" >&2 ++ exit 1 + } + + warning() + { +- echo "$PROG: Warning: $*" >&2 ++ echo "$PROG: Warning: $*" >&2 + } + FIELD_NO=$1 DELIM=$1 @@ -272,19 +316,25 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.1.0/tools/ TMP_FILE=$BLTK_HOME/tmp/hdparm +DEV_INFO=$BLTK_HOME/tmp/dev_info + -+/usr/bin/devkit-disks --dump > $TMP_FILE ++/usr/bin/udisksctl dump > $TMP_FILE #str=`df -lk / | grep -v ^Filesystem` str=`df -lk / | grep ^/dev/` -@@ -74,30 +79,40 @@ fi +@@ -69,35 +74,45 @@ HD_NAME=${DF_NAME%%[0-9]*} + grep -w "$HD_NAME" "$PARTITIONS" >/dev/null 2>&1 + if [[ $? != 0 ]] + then +- warning "Cannot determine hard disk $HD_NAME statistics" ++ warning "Cannot determine hard disk $HD_NAME statistics" + fi HD_DEV_NAME=/dev/$HD_NAME +while read line +do -+ if [[ $READING -eq 0 && `echo $line | grep '^Showing'` ]]; then ++ if [[ $READING -eq 0 && `echo $line | grep '^/'` ]]; then + READING=1 -+ elif [[ $READING -eq 1 && `echo $line | grep =====` ]]; then ++ elif [[ $READING -eq 1 && -z "$line" ]]; then + READING=0 + if [ $FOUND -eq 1 ]; then + break; @@ -293,11 +343,11 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.1.0/tools/ + fi + fi + -+ if [[ $READING -eq 1 ]]; then ++ if [[ $READING -eq 1 ]]; then + echo $line >> $DEV_INFO + fi + -+ if [[ `echo $line | grep "device-file: *$HD_DEV_NAME"` ]]; then ++ if [[ `echo $line | grep "Device: *$HD_DEV_NAME"` ]]; then + FOUND=1 + fi +done < $TMP_FILE @@ -320,13 +370,13 @@ diff -up bltk-1.1.0/tools/bltk/bltk_get_user_field.sh.sec_sudo bltk-1.1.0/tools/ - str=`echo $str` -fi -echo "HD_MODEL = $str" -+echo "HD_MODEL = `grep '^model:' $DEV_INFO | sed 's/^model: //'`" ++echo "HD_MODEL = `grep '^Model:' $DEV_INFO | sed 's/^Model: *//'`" -str=`grep 'device size with M = 1000' $TMP_FILE` -str=${str#*device size with M = 1000*:} -str=`echo $str` -echo "HD_SIZE = $str" -+str=`grep '^size:' $DEV_INFO | sed 's/^size: //'` ++str=`grep '^Size:' $DEV_INFO | sed 's/^Size: *//'` +echo "HD_SIZE = $((str/1000000)) MBytes ($((str/1000000000)) GB)" -rm -f $TMP_FILE diff --git a/bltk.spec b/bltk.spec index c7a62dc..66e2fd6 100644 --- a/bltk.spec +++ b/bltk.spec @@ -1,6 +1,6 @@ Name: bltk Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The BLTK measures notebook battery life under any workload Group: Applications/System @@ -33,7 +33,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel -Requires: udisks gnuplot +Requires: udisks2 gnuplot %description This tool kit is used to measure battery life and performance under @@ -230,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/bltk/wl_reader/war_and_peace.html %changelog +* Mon May 7 2012 Jaroslav Škarvada - 1.1.0-2 +- Switched to udisks2 + * Thu Mar 29 2012 Jaroslav Škarvada - 1.1.0-1 - New version - Dropped office_scen patch (upstreamed)